diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index bb763d78660ff6c7a6d712cb7055ab8c26c145e6..4a5bc8271872569dc24933d7995675fa36d1ceb9 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -9,7 +9,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
@@ -17,7 +17,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"></translation>
</message>
@@ -122,7 +122,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -130,13 +130,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
@@ -144,17 +144,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -162,7 +162,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -183,12 +183,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
@@ -201,27 +201,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
@@ -333,7 +333,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"></translation>
</message>
@@ -361,7 +361,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -384,7 +384,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -767,27 +767,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -1639,6 +1644,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1871,17 +1990,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"></translation>
</message>
@@ -1920,14 +2039,6 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1962,13 +2073,13 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"></translation>
</message>
@@ -1976,7 +2087,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"></translation>
</message>
@@ -2004,7 +2115,7 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
@@ -2030,7 +2141,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"></translation>
</message>
@@ -2176,20 +2287,43 @@ Please try again later.</source>
<translation></translation>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
@@ -2241,7 +2375,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -2264,33 +2398,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index 986834d8950bcee351281731199ff823b7b2d130..935369cb43c59bc795286434f8c067da5f33ff6b 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -7,7 +7,7 @@
<translation>عن</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>جهات الاتصال المحظورة</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>بدأ مكالمة صوتية</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>حظر جهة إتصال</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>ملف شخصي</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>إنشاء حساب جامي</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>حول جامي</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>بحث تلقائي عن التحديثات</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>موافق</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>إلغاء</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>إضافة إلى المحادثات</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>رفع الحظر عن جهة الاتصال</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>إرسال</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>إرسال ملف</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>اقبل</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>أرفض</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>حظر</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>كتابة رسالة</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>ملاحظة: يمكنك قبول هذه الدعوة بشكل تلقائي عبر إرسال رسالة.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>في هذه اللحظة</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>إخفاق</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>حذف</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>إعادة المحاولة</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>حساب</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>عام</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>صوت/فيديو</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>الإضافات</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>التقاط صورة</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>إلغاء</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>حساب</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>عام</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>صوت/فيديو</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>عام</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>حول جامي</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index 8432659c917c1ee0f3e1562f91e3e2bfaa6027fc..40bb5e790febadb620ebebf1801922bfb2ce00da 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -7,7 +7,7 @@
<translation>Относно</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Затваряне</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Блокирани контакти</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Започване на видео разговор</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Започване на гласов разговор</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Изчистване на разговора</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Блокиране на контакт</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Профил</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Създаване на профил в Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Автоматична проверка за обновления</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Добре</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Отказ</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Профил</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Общи</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Звук/видео</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Мрежова грешка</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Направи снимка</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Отказ</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Общи</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Относно Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index 5b68afe7944c436315f385566628dc7e4a431b6b..2f7bb1a4068cd267688987574566533d6ff08404 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -7,7 +7,7 @@
<translation>Quant a</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Tanca</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Afegeix compte</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contactes blocats</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Comença una videotrucada</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Comença una trucada de veu.</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Neteja la conversa</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Elimina el contacte</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloqueja el contacte</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Id del dispositiu</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Desa el nou nom de dispositiu</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Crear un compte Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Sobre Jami...</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>D'acord</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Canceŀla</translation>
</message>
@@ -1638,6 +1643,143 @@ Copiï'l i comparteixi'l amb els seus amics!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Amaga finestra de xat</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Fes una video trucada</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Fes una trucada de veu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Afegir a les converses</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Desbloca contacte</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Envia</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Envia el fitxer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Accepta</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Rebutja</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bloca</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Escrigui un missatge</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Nota: una interacció crearà un nou contacte</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Nota: pot acceptar automàticament aquesta invitació enviant un missatge.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>Ara mateix</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Fallida</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Suprimeix</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Reintentar</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copiï'l i comparteixi'l amb els seus amics!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>General</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Error de xarxa</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Fer foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Canceŀla</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Compte</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>General</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Sobre Jami...</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Benvingut a</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts
index 9e85d2c91af9457b5beb2fdfdab289bc0b16a869..2f514ac882e3eaec8000454b571611eae6dfa2e3 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -7,7 +7,7 @@
<translation>O aplikaci</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Zavřít</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Přidat účet</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Zakázané kontakty</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>Já</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation>vám volá</translation>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Přidat do konference</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation>Přesměrovat tento hovor</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>Hledat kontakty</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation>Přepnout zobrazení bočního panelu</translation>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Přidat do konference</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation>Přesměrovat tento hovor</translation>
</message>
@@ -199,27 +199,27 @@
<translation>Začít video hovor</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Začít audio hovor</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Vyprázdnit konverzaci</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Odstranit kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blokovat spojení</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>ID zařízení</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Uložit název nového zařízení</translation>
</message>
@@ -359,7 +359,7 @@
<translation>Vytváří se účet…</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation>Zpět na uvítací stránku</translation>
</message>
@@ -382,7 +382,7 @@
<translation>Vytváří se účet…</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation>Zpět na uvítací stránku</translation>
</message>
@@ -765,27 +765,32 @@
<translation>Vytvořit účet Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>O Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation>Zamítnout žádost o kontakt</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation>Přijmout žádost o kontakt</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Automaticky zkontrolovat aktualizace</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Zrušit</translation>
</message>
@@ -1398,7 +1403,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="279"/>
<source>toggle automatic updates</source>
- <translation type="unfinished"/>
+ <translation>přepnout nastavení automatických aktualizací</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="280"/>
@@ -1414,37 +1419,38 @@
<location filename="../src/constant/JamiStrings.qml" line="282"/>
<source>A new version of Jami was found
Would you like to update now?</source>
- <translation type="unfinished"/>
+ <translation>Byla nalezena nová verze Jami.
+Přejete si nyní provést aktualizaci?</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="283"/>
<source>No new version of Jami was found</source>
- <translation type="unfinished"/>
+ <translation>Nebyla nalezena žádná nová verze Jami.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="284"/>
<source>An error occured when checking for a new version</source>
- <translation type="unfinished"/>
+ <translation>Při zjišťování dostupnosti nové verze došlo k chybě.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="285"/>
<source>Installer download failed due to a network error</source>
- <translation type="unfinished"/>
+ <translation>Stažení instalačního souboru selhalo kvůli chybě sítě.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="286"/>
<source>Installer download canceled</source>
- <translation type="unfinished"/>
+ <translation>Stažení instalačního souboru bylo zrušeno.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="288"/>
<source>This will uninstall your current Release version and you can always download the latest Release version on our website</source>
- <translation type="unfinished"/>
+ <translation>Tímto bude odinstalována vaše současná verze vydání. Nejnovější verzi vydání můžete vždy stáhnout z naší webové stránky.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="289"/>
<source>Network disconnected</source>
- <translation type="unfinished"/>
+ <translation>Síť odpojena.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="290"/>
@@ -1638,6 +1644,143 @@ Zkopírujte je a sdílejte je se svými přáteli!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation>Při vytváření účtu došlo k chybě. Zkontrolujte své přihlašovací údaje.</translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Skrýt zprávy</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Uskutečnit video hovor</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Uskutečnit audio hovor</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Přidat do konverzací</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Odblokovat kontakt</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Odeslat</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Poslat soubor</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Přijmout</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Odmítnout</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blokovat</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Napište zprávu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Poznámka: interakce vytvoří nový kontakt.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Poznámka: můžete tuto pozvánku automaticky přijmout posláním zprávy</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>teď</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Selhání</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Odstranit</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Zkusit znovu</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1898,6 @@ Zkopírujte je a sdílejte je se svými přáteli!</translation>
<translation>Zamítnout žádost o hovor</translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Účet</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Obecné</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Zvuk/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Zásuvné moduly</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1872,17 +1992,17 @@ Zkuste to, prosím, později znovu.</translation>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Zvolit zásuvný modul</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation>Přejít zpět na seznam zásuvných modulů</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation>Předvolby</translation>
</message>
@@ -1921,14 +2041,6 @@ Zkuste to, prosím, později znovu.</translation>
<translation>Chyba sítě</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation>Zrušit hovor</translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1963,13 +2075,13 @@ Zkuste to, prosím, později znovu.</translation>
<translation>Všechny soubory</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Vyfotit</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation>Vyfotit znovu</translation>
</message>
@@ -1977,7 +2089,7 @@ Zkuste to, prosím, později znovu.</translation>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation>Načíst/vysunout</translation>
</message>
@@ -2005,7 +2117,7 @@ Zkuste to, prosím, později znovu.</translation>
<translation>Zrušit</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>Odinstalovat</translation>
</message>
@@ -2031,7 +2143,7 @@ Zkuste to, prosím, později znovu.</translation>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation>Upravit předvolbu</translation>
</message>
@@ -2177,20 +2289,43 @@ Zkuste to, prosím, později znovu.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Účet</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Obecné</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Zvuk/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Zásuvný modul</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Nastavení účtu</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Obecné</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Zásuvný modul</translation>
</message>
@@ -2242,7 +2377,7 @@ Zkuste to, prosím, později znovu.</translation>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation>Přepnout zobrazení bočního panelu</translation>
</message>
@@ -2265,33 +2400,28 @@ Zkuste to, prosím, později znovu.</translation>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>O Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Vítejte v</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation>Vytvořit nový účet Jami</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation>Importovat účet z jiného zařízení</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation>Importovat účet ze záložního souboru</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation>Vytvořit nový účet SIP</translation>
</message>
diff --git a/translations/ring_client_windows_da.ts b/translations/ring_client_windows_da.ts
index a52a49e57b6a97d29ac79102a0062bf1d1530800..a9bd8c92d22379b675b70d40efc77ac1faf52778 100644
--- a/translations/ring_client_windows_da.ts
+++ b/translations/ring_client_windows_da.ts
@@ -7,7 +7,7 @@
<translation>Om</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Luk</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Blokerede kontakter</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Tilføj til konference</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Tilføj til konference</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Start et video opkald</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Start et audio opkald</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Ryd samtale</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Fjern kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloker kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Søg automatisk efter opdateringer</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annuller</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Generelt</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Lyd/video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Netværksfejl</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Tag billede</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Annuller</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Generelt</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Om Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Velkommen til </translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index 5cb3e70ae7043b5e57603cb95fa16b5eaaecae06..85de4056eab0c140b04882c4905397db2cc1d52f 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -9,7 +9,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
@@ -17,7 +17,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"></translation>
</message>
@@ -122,7 +122,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -130,13 +130,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
@@ -144,17 +144,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -162,7 +162,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -183,12 +183,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
@@ -201,27 +201,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
@@ -333,7 +333,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"></translation>
</message>
@@ -361,7 +361,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -384,7 +384,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -767,27 +767,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished">Annuller</translation>
</message>
@@ -1639,6 +1644,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Generelt</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1871,17 +1990,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"></translation>
</message>
@@ -1920,14 +2039,6 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1962,13 +2073,13 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"></translation>
</message>
@@ -1976,7 +2087,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"></translation>
</message>
@@ -2004,7 +2115,7 @@ Please try again later.</source>
<translation type="unfinished">Annuller</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
@@ -2030,7 +2141,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"></translation>
</message>
@@ -2176,20 +2287,43 @@ Please try again later.</source>
<translation></translation>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished">Konto</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished">Generelt</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished">Generelt</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
@@ -2241,7 +2375,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -2264,33 +2398,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index bceec9b21aba1bd02b6550ac3de9093a664d0d13..b7799d514a7909190ce640ecef778c651b23ca17 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -7,7 +7,7 @@
<translation>Über</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Konto hinzufügen</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Gesperrte Kontakte</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Zur Konferenz hinzufügen</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Zur Konferenz hinzufügen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Videoanruf starten</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Audioanruf starten</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Gesprächsverlauf löschen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Entferne Kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Kontakt blockieren</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Gerätekennung</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Neuen Gerätenamen speichern</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Ein Jami-Konto erstellen</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Automatisch auf Aktualisierungen prüfen</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
@@ -1638,6 +1643,143 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Allgemein</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Plugins</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Netzwerkfehler</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Ein Foto aufnehmen</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Kontoeinstellungen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Plugin</translation>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Über Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Willkommen bei</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts
index 39df8f7b8f407c142ee02f1583badde3e171fd55..7612b38e9e69b4637ecaee85d4959863bc98ccf6 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -7,7 +7,7 @@
<translation>Über</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Kontakt blockieren</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Jami-Konto erstellen</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Über Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
@@ -1638,6 +1643,143 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Chat verbergen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Senden</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Datei senden</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Akzeptieren</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Ablehnen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blockieren</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Löschen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Wiederholen</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Allgemein</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Netzwerkfehler</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Bild aufnehmen</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Abbrechen</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Konto</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Allgemein</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Plugin</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Plugin</translation>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Über Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index 98e8b8e7343cd56d5828bb4fe0a67352d23d1b78..87c6e5882ab617f5fc1bed4f99a116338a7a0b58 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -7,7 +7,7 @@
<translation>Περί</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Κλείσιμο</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Προφίλ</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Εντάξει</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Ακύρωση</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Λογαριασμός</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Γενικά</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Ήχος/Βίντεο</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Σφάλμα δικτύου</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Λήψη φωτογραφίας</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Ακύρωση</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Γενικά</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Σχετικά με το Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index 817432b6ab8f13b55ab2ae08fc1e5987cb21ff7b..1f337c26530f5b389550c886a8081fe6f2b0ee3f 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -9,7 +9,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
@@ -17,7 +17,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"></translation>
</message>
@@ -122,7 +122,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -130,13 +130,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
@@ -144,17 +144,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -162,7 +162,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -183,12 +183,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
@@ -201,27 +201,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
@@ -333,7 +333,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"></translation>
</message>
@@ -361,7 +361,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -384,7 +384,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -767,27 +767,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -1639,6 +1644,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1871,17 +1990,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"></translation>
</message>
@@ -1920,14 +2039,6 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1962,13 +2073,13 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"></translation>
</message>
@@ -1976,7 +2087,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"></translation>
</message>
@@ -2004,7 +2115,7 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
@@ -2030,7 +2141,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"></translation>
</message>
@@ -2176,20 +2287,43 @@ Please try again later.</source>
<translation></translation>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
@@ -2241,7 +2375,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -2264,33 +2398,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index 341a520d9e7f849345ee7970b0395b6820297622..b63c5a36eaa58584e2d892e13e1b7787f1bee692 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -7,7 +7,7 @@
<translation>Pri</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profilo</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Aŭtomate kontroli ĝisdatigojn</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Okej</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Rezigni</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Kaŝi babilejon</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Sendi</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Akcepti</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Rifuzi</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Forigi</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Ĝeneralaj</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Aŭdio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Reta eraro</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Foti</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Rezigni</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Konto</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Ĝeneralaj</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Aŭdio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Ĝeneralaj</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index d1db2782c1263d549183b2780ab0fa6d3a41d1e1..3e949cdc68832dcaa429ba4882c9b9e2e1089ee8 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -7,7 +7,7 @@
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Cerrar</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Añadir cuenta</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contactos bloqueados</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>yo</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Agregar a la conferencia</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>Buscar contactos</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Agregar a la conferencia</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Iniciar videollamada</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Empezar llamada de audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Limpiar conversación</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Eliminar contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquear contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Identificador de dispositivo</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Guardar nuevo nombre de dispositivo</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Crear una cuenta en Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Verificar actualizaciones automaticamente</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Aceptar</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -1638,6 +1643,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>General</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Complementos</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1871,17 +1990,17 @@ Por favor inténtalo más tarde.</translation>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Elegir complemento</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1920,14 +2039,6 @@ Por favor inténtalo más tarde.</translation>
<translation>Error en la red</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1962,13 +2073,13 @@ Por favor inténtalo más tarde.</translation>
<translation>Todos los archivos</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Sacar una foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1976,7 +2087,7 @@ Por favor inténtalo más tarde.</translation>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2004,7 +2115,7 @@ Por favor inténtalo más tarde.</translation>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>Desinstalar</translation>
</message>
@@ -2030,7 +2141,7 @@ Por favor inténtalo más tarde.</translation>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2176,20 +2287,43 @@ Por favor inténtalo más tarde.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Configuración de la cuenta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Complemento</translation>
</message>
@@ -2241,7 +2375,7 @@ Por favor inténtalo más tarde.</translation>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2264,33 +2398,28 @@ Por favor inténtalo más tarde.</translation>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Acerca de Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Bienvenido a</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_es_AR.ts b/translations/ring_client_windows_es_AR.ts
index 0b45c170725abcda4f02ffe56a0e07b97841bc26..1777a4a49cab0b3f47ff53792188ac8647b02b30 100644
--- a/translations/ring_client_windows_es_AR.ts
+++ b/translations/ring_client_windows_es_AR.ts
@@ -7,7 +7,7 @@
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Cerrar</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Añadir cuenta</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contactos bloqueados</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Agregar a conferencia</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Agregar a conferencia</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Iniciar una videollamada</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Iniciar una llamada de voz</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Limpiar conversación</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Eliminar contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquear contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>ID del dispositivo</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Guardar nmbre de nuevo dispositivo</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Crear una cuenta de Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Acerca de Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Comprobar actualizaciones automáticamente</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -1638,6 +1643,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Ocultar vista de conversación</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Realizar videollamada</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Realizar adiollamada</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Agregar a conversaciones</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Desbloquear contacto</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Enviar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Enviar archivo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Aceptar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Rechazar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bloquear</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Escribí un mensaje</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Nota: una interacción creará un nuevo contacto.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Nota: podés aceptar automáticamente esta invitación enviando un mensaje.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>hace un momento</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Falla</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Eliminar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Reintentar</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>General</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Error de red</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Tomar foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Cuenta</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>General</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Acerca de Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Bienvenido a</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_es_MX.ts b/translations/ring_client_windows_es_MX.ts
index 78fd8b722e2d4fe186588d6ee401c8843042bc17..02bb1b88e8aee8a8cf93a3133a9028620ad04c6c 100644
--- a/translations/ring_client_windows_es_MX.ts
+++ b/translations/ring_client_windows_es_MX.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Tomar foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_et.ts b/translations/ring_client_windows_et.ts
index c45b44a4750b1c32b4dc7b3676f75ccde0a3253e..0ccc017ac7cd36ec4095213959251c7ff907ad93 100644
--- a/translations/ring_client_windows_et.ts
+++ b/translations/ring_client_windows_et.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blokeeri kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index f49c4e4ff552d5fc618a2f6c550f2ff5b27841f9..e6548f33c044fcc60c132c64d989bdbf448b8a72 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -9,7 +9,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
@@ -17,7 +17,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"></translation>
</message>
@@ -122,7 +122,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -130,13 +130,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
@@ -144,17 +144,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -162,7 +162,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -183,12 +183,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
@@ -201,27 +201,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
@@ -333,7 +333,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"></translation>
</message>
@@ -361,7 +361,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -384,7 +384,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -767,27 +767,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -1639,6 +1644,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1871,17 +1990,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"></translation>
</message>
@@ -1920,14 +2039,6 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1962,13 +2073,13 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"></translation>
</message>
@@ -1976,7 +2087,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"></translation>
</message>
@@ -2004,7 +2115,7 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
@@ -2030,7 +2141,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"></translation>
</message>
@@ -2176,20 +2287,43 @@ Please try again later.</source>
<translation></translation>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
@@ -2241,7 +2375,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -2264,33 +2398,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_eu.ts b/translations/ring_client_windows_eu.ts
index c7a3f591b1ff9613da9e4228222d0dc3c2e3d446..15f7708cb8a300c739a47704b0157c209b17e5ee 100644
--- a/translations/ring_client_windows_eu.ts
+++ b/translations/ring_client_windows_eu.ts
@@ -7,7 +7,7 @@
<translation>Honi buruz</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Itxi</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Gehitu kontua</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Hasi bideo-deia</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Hasi audio-deia</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Kendu kontaktua</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blokeatu kontaktua</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profila</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Sortu Jami kontua</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Jamiri buruz</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ados</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Ezeztatu</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Bidali</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Bidali fitxategia</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Onartu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Ukatu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bloketu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Ezabatu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Kontua</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Orokorra</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Sare errorea</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Atera argazkia</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Ezeztatu</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Kontua</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Orokorra</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Orokorra</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Jamiri buruz</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts
index c7e3a3ce26b16195beb2ea6d0cabb64acec14e53..61271e98a7f6aea9d8df000697f870e579173435 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -7,7 +7,7 @@
<translation>درباره</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>بستن</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>افزودن حساب</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>مخاطبان مسدود شده</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>افزودن به نشست</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>افزودن به نشست</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>شروع تماس ویدیویی</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>شروع تماس صوتی</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>پاک کردن گفتگو</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>حذف مخاطب</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>مسدودسازی مخاطب</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>نمایه</translation>
</message>
@@ -331,7 +331,7 @@
<translation>شناسه دستگاه</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>ذخیره نام جدید دستگاه </translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>ایجاد یک حساب جمی</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>درباره جمی</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>بررسی خودکار وجود بروزرسانی </translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>قبول</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>لغو</translation>
</message>
@@ -1638,6 +1643,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>مخفیکردن نمای گفتگو</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>قرار تماس ویدیویی بگذار</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>قرار تماس صوتی بگذار</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>افزودن به گفتگوها</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>رفع ممنوعیت مخاطب</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>ارسال</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>ارسال فایل</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>پذیرش</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>رد کردن</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>مسدود</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>نوشتن یک پیام</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>توجه: یک تعامل مخاطبی جدید ایجاد میکند.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>توجه: شما می توانید با ارسال پیام به طور خودکار این دعوت را بپذیرید.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>همین الان</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>عدم موفقیت</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>حذف</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>تلاش دوباره</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>حساب</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>عمومی</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>صدا/تصویر</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>افزونهها</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>انتخاب افزونه</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>خطای شبکه</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>عکس بگیرید!</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>لغو</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>حساب</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>عمومی</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>صدا/تصویر</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>افزونه</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>عمومی</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>افزونه</translation>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>درباره جمی</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>خوش آمدید به</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index 3e030cc290ab2aa66c52f33fd06893c19931a034..417158c2ff517b230681b67ffbfab72c41804846 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -7,7 +7,7 @@
<translation>Tietoa</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Sulje</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Lisää tunnus</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Estetyt yhteystiedot</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>minä</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Lisää kokoukseen</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation>Siirrä tämä puhelu</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>Hae yhteystietoja</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Lisää kokoukseen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation>Siirrä tämä puhelu</translation>
</message>
@@ -199,27 +199,27 @@
<translation>Aloita videopuhelu</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Aloita äänipuhelu</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Tyhjennä keskustelu</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Poista yhteystieto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Estä yhteystieto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profiili</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Laitteen Id</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Tallenna uuden laitteen nimi</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -682,7 +682,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="214"/>
<source>Create a rendezvous point</source>
- <translation type="unfinished"/>
+ <translation>Luo tapaamispaikka</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="217"/>
@@ -692,7 +692,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="219"/>
<source>Choose a name for your rendezvous point</source>
- <translation type="unfinished"/>
+ <translation>Valitse tapaamispaikan nimi</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="270"/>
@@ -702,7 +702,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="306"/>
<source>Enter the PIN from another configured Jami account. Use the "Link Another Device" feature to obtain a PIN.</source>
- <translation type="unfinished"/>
+ <translation>Syötä toisen määritetyn Jami-tilin PIN-koodi. Käytä PIN-koodin "Yhdistä toinen laite" -ominaisuutta.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="308"/>
@@ -765,27 +765,32 @@
<translation>Luo Jami-tili</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Tietoa Jamista</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Tarkista päivitykset automaattisesti</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Vahvista</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
@@ -1092,7 +1097,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="185"/>
<source>More options</source>
- <translation type="unfinished"/>
+ <translation>Lisää vaihtoehtoja</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="188"/>
@@ -1157,7 +1162,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="202"/>
<source>Enter Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>Anna Jami Account Management Serverin (JAMS) verkko-osoite</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="203"/>
@@ -1172,7 +1177,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="205"/>
<source>Enter your JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>Anna JAMS-tunnuksesi</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="206"/>
@@ -1474,17 +1479,17 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="299"/>
<source>You can obtain an archive by clicking on "Backup account" in the account settings. This will create a .gz file on your device.</source>
- <translation type="unfinished"/>
+ <translation>Voit tehdä pakatun varmistuksen napsauttamalla "Varmuuskopioi tili" Tilin asetuksissa. Tämä luo gz-tiedoston laitteellesi.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="302"/>
<source>Restore an account from backup</source>
- <translation type="unfinished"/>
+ <translation>Tilin palauttaminen varmuuskopiosta</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="305"/>
<source>Enter Jami account password</source>
- <translation type="unfinished"/>
+ <translation>Anna Jami-tilin salasana</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="314"/>
@@ -1616,7 +1621,7 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="370"/>
<source>Advanced features</source>
- <translation type="unfinished"/>
+ <translation>Lisäominaisuudet</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="371"/>
@@ -1626,7 +1631,7 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="372"/>
<source>Connect to a JAMS server</source>
- <translation type="unfinished"/>
+ <translation>Yhdistä JAMS-palvelimeen</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="374"/>
@@ -1638,6 +1643,143 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Piilota chat-näkymä</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Aloita videopuhelu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Aloita äänipuhelu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Lisää keskusteluihin</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Poista esto</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Lähetä</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Lähetä tiedosto</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Hyväksy</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Kieltäydy</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Estä</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Kirjoita viesti</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Huomaa: yhteydenotto tekee uuden yhteystiedon.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Huomaa: voit automaattisesti hyväksyä tämän kutsun lähettämällä viestin.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>juuri nyt</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Virhe</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Poista</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Yritä uudelleen</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Tunnus</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Yleiset</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Ääni/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Lisäosat</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1872,17 +1991,17 @@ Yritä myöhemmin uudelleen.</translation>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Valitse lisäosa</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1921,14 +2040,6 @@ Yritä myöhemmin uudelleen.</translation>
<translation>Verkkovirhe</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1963,13 +2074,13 @@ Yritä myöhemmin uudelleen.</translation>
<translation>Kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Ota valokuva</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1977,7 +2088,7 @@ Yritä myöhemmin uudelleen.</translation>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation>Lataa/poista</translation>
</message>
@@ -2005,7 +2116,7 @@ Yritä myöhemmin uudelleen.</translation>
<translation>Peruuta</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>Poista asennus</translation>
</message>
@@ -2031,7 +2142,7 @@ Yritä myöhemmin uudelleen.</translation>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2177,20 +2288,43 @@ Yritä myöhemmin uudelleen.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Tunnus</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Yleiset</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Ääni/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Lisäosa</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Yleiset</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Lisäosa</translation>
</message>
@@ -2242,7 +2376,7 @@ Yritä myöhemmin uudelleen.</translation>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2265,33 +2399,28 @@ Yritä myöhemmin uudelleen.</translation>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Tietoa Jamista</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Tervetuloa</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index 2da39e99c2f620fd3463359906ed49d59a90aa02..7182e0484b8f552a8511021454b3c130ef032399 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -7,7 +7,7 @@
<translation>À Propos</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Ajouter un compte</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contacts bannis</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>moi</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation>vous appelle</translation>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Ajouter à la conférence</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation>Transférer cet appel</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>Recherche des contacts</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation>Afficher le tableau à coté</translation>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Ajouter à la conférence</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation>Transférer cet appel</translation>
</message>
@@ -199,27 +199,27 @@
<translation>Démarrer un appel vidéo</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Démarrer un appel audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Effacer la conversation</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Retirer le contact</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquer le contact</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Identifiant d'appareil</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Sauvegarder le nouveau nom d'appareil</translation>
</message>
@@ -359,7 +359,7 @@
<translation>Création du compte en cours... </translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation>Revenir à la page de bienvenue</translation>
</message>
@@ -382,7 +382,7 @@
<translation>Création du compte en cours... </translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation>Revenir à la page de bienvenue</translation>
</message>
@@ -768,27 +768,32 @@ Notez que le mot de passe ne peut être récupéré.</translation>
<translation>Créer un compte Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>À propos de Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation>Refuser la demande de contact</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation>Accepter la demande de contact</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Vérifier automatiquement les mises à jour</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -1641,6 +1646,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation>Une erreur est survenue pendant la création de compte. Vérifiez votre mot de passe.</translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Cacher la fenêtre de clavardage</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Faire un appel vidéo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Faire un appel audio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Ajouter aux conversations</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Débloquer le contact</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Envoyer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Envoyez un fichier</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Accepter</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Refuser</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bloquer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Écrivez un message</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Remarque: une interaction créera un nouveau contact.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Remarque: vous pouvez automatiquement accepter une invitation en lui répondant.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>juste maintenant</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Échec</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Supprimer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Réessaie</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1758,29 +1900,6 @@ Copy and share it with your friends!</source>
<translation>Refuser l'appel</translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Général</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Vidéo</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Modules d'extension</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1874,17 +1993,17 @@ Veuillez réessayer plus tard</translation>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Choisir un module d'extension</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation>Revenir à la liste des modules d'extension</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation>Préférences</translation>
</message>
@@ -1923,14 +2042,6 @@ Veuillez réessayer plus tard</translation>
<translation>Erreur de réseau</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation>Annuler l'appel</translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1965,13 +2076,13 @@ Veuillez réessayer plus tard</translation>
<translation>Tous les fichiers</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Prendre une photo</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation>Reprendre une photo</translation>
</message>
@@ -1979,7 +2090,7 @@ Veuillez réessayer plus tard</translation>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation>Charger/décharger</translation>
</message>
@@ -2007,7 +2118,7 @@ Veuillez réessayer plus tard</translation>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>Désinstaller</translation>
</message>
@@ -2033,7 +2144,7 @@ Veuillez réessayer plus tard</translation>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation>Modifier les préférences</translation>
</message>
@@ -2179,20 +2290,43 @@ Veuillez réessayer plus tard</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Compte</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Général</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Vidéo</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Module d'extension</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Paramètres Compte Jami</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Module d'extension</translation>
</message>
@@ -2244,7 +2378,7 @@ Veuillez réessayer plus tard</translation>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation>Afficher le tableau à coté</translation>
</message>
@@ -2267,33 +2401,28 @@ Veuillez réessayer plus tard</translation>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>À propos de Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Bienvenue sur</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation>Créer un nouveau compte Jami </translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation>Créer un compte à partir d'un autre appareil</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation>Créer un compte à partir d'une sauvegarde</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation>Créer un nouveau compte SIP</translation>
</message>
diff --git a/translations/ring_client_windows_fr_BE.ts b/translations/ring_client_windows_fr_BE.ts
index d4b5bc998d557e7178249e4d4a8a75172591e103..c0b75bcfc4a0c94bcb148652fefc3a9fa3135102 100644
--- a/translations/ring_client_windows_fr_BE.ts
+++ b/translations/ring_client_windows_fr_BE.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contacts bloqués</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Démarrer appel video</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Démarrer appel audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Effacer la conversation</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquer le contact</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Créer un compte Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Faire un appel vidéo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Faire un appel audio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Envoyer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Accepter</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Refuser</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Général</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Compte</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Général</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts
index af3414612974eab975941d7ccfac18d180aa1f6e..1d50ed1940a3bee1c4dde53d708613e3a1badf3e 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -7,7 +7,7 @@
<translation>À propos</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Ajouter un compte</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contacts bloqués</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Démarrer appel video</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Démarrer appel audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Effacer la conversation</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Supprimer contact</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquer le contact</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Créer un compte Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Faire un appel vidéo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Faire un appel audio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Envoyer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Accepter</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Refuser</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bloquer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Supprimer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Général</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Vidéo</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Erreur de réseau</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Prendre une photo</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Compte</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Général</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Vidéo</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Paramètres du compte</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fr_CH.ts b/translations/ring_client_windows_fr_CH.ts
index 16acb736cde1f278427797eb567b22312578f320..0dd76c935edb472229cc534766dfe8b9937db9cc 100644
--- a/translations/ring_client_windows_fr_CH.ts
+++ b/translations/ring_client_windows_fr_CH.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contacts bloqués</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Démarrer appel video</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Démarrer appel audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Effacer la conversation</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquer le contact</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Créer un compte Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Général</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts
index 8f6b8c3fc44957ed7a39c6a02ef4907a40afd9ff..ee753ed7410f821c804751ae97581f104f24def4 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -7,7 +7,7 @@
<translation>A propos </translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contacts bloqués</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Démarrer appel video</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Démarrer appel audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Effacer la conversation</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquer le contact</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Créer un compte Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>À propos de Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>d'accord</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Faire un appel vidéo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Faire un appel audio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Envoyer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Envoyer le fichier</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Accepter</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Refuser</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bloquer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Supprimer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Général</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Compte</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Général</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>À propos de Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_gl.ts b/translations/ring_client_windows_gl.ts
index 1973a3bcde65145b80e5242f4cbe203f2db281ad..38b1785f798272d324ae014dde60d7aa69ea5033 100644
--- a/translations/ring_client_windows_gl.ts
+++ b/translations/ring_client_windows_gl.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contactos excluídos</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Iniciar chamada de vídeo</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Iniciar chamada de audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Limpar conversa</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquear contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Crear conta Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Comprobar automáticamente actualizacións</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Xeral</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Fallo na rede</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Tomar foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Xeral</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Acerca de Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Benvido/a a</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index d65a42cf96e73ea1434f022ff9271aeeff003a5d..6a1872a3294eaed5bc68c9eff322f0dfc4642e7a 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -7,7 +7,7 @@
<translation>אודות</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>פרופיל</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>ביטול</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>חשבון</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>כלליות</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>אודיו/וידאו</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>ביטול</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>כלליות</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index 228f10a1d738198ab5546e0878794727577ec3df..3df4af5a34c2ec26b83c53ff9be6822be8fdac66 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>खाता</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>खाता</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index 6d106b159564e82857e653ca07eabd406a35a2c2..2bf7893bd73041c39133c1e38a4901d88a172fa6 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -7,7 +7,7 @@
<translation>O programu</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blokiraj kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Napravite Jami račun</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>O Jami-u</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Automatski potraži ažuriranja</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>U redu</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Poništi</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Pošalji</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Pošalji datoteku</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Prihvati</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Odbij</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blokiraj</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Izbriši</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Račun</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Opće</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Greška mreže</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Poništi</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Račun</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Opće</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Opće</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>O Jami-u</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index 51e5681a5217aa5a57bfc97315ba2ce1c0c85708..dc61e36254c217a33d61757540d214d6a48eee9f 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -7,7 +7,7 @@
<translation>Névjegy</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Bezárás</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Fiók hozzáadása</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Letiltott kapcsolatok</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>én</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation>hív</translation>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Hozzáadás a konferenciához</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation>Hívás átadása</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>Keresés a kapcsolatok között</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation>Oldallap nézet be-/kikapcsolása</translation>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Hozzáadás a konferenciához</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation>Hívás átadása</translation>
</message>
@@ -199,27 +199,27 @@
<translation>Videóhívás indítása</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Hanghívás indítása</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Beszélgetés törlése</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Kapcsolat eltávolítása</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Kapcsolat letiltása</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Eszközazonosító</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Új eszköz nevének mentése</translation>
</message>
@@ -359,7 +359,7 @@
<translation>Fiók létrehozása…</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation>Vissza kezdőlapra</translation>
</message>
@@ -382,7 +382,7 @@
<translation>Fiók létrehozása…</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation>Vissza kezdőlapra</translation>
</message>
@@ -765,27 +765,32 @@
<translation>Jami-fiók létrehozása</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>A Jami névjegye</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation>Kapcsolatkérelem elutasítása</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation>Kapcsolatfelvételi kérelem elfogadása</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Frissítések önműködő ellenőrzése</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Rendben</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Mégse</translation>
</message>
@@ -1639,6 +1644,143 @@ Másolja ki, és ossza meg barátaival!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation>Hiba történt a fiók létrehozása során. Kérjük, ellenőrizze hitelesítő adatait.</translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Csevegés nézet elrejtése</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Videohívás</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Hanghívás</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Beszélgetések hozzáadása</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Kapcsolat letiltás feloldása</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Elküld</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Fájl küldése</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Elfogadás</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Elutasítás</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Letiltás</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Üzenet írása</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Megjegyzés: az együttműködés új kapcsolatot hoz létre.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Megjegyzés: az üzenet elküldésével önműködően elfogadhatja ezt a meghívást.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>most</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Hiba</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Törlés</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Újra</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Másolja ki, és ossza meg barátaival!</translation>
<translation>Hívás kérelem elutasítása</translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Fiók</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Általános</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Hang/videó</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Beépülő modulok</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1872,17 +1991,17 @@ Kérjük, hogy próbálja újra később.</translation>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Beépülő modul kiválasztása</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation>Visszatérés a beépülő modulok listájához</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation>Beállítások</translation>
</message>
@@ -1921,14 +2040,6 @@ Kérjük, hogy próbálja újra később.</translation>
<translation>Hálózati hiba</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation>Hívás visszavonása</translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1963,13 +2074,13 @@ Kérjük, hogy próbálja újra később.</translation>
<translation>Minden fájl</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Fénykép készítése</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation>Új fénykép készítése</translation>
</message>
@@ -1977,7 +2088,7 @@ Kérjük, hogy próbálja újra később.</translation>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation>Betöltés/kirakodás</translation>
</message>
@@ -2005,7 +2116,7 @@ Kérjük, hogy próbálja újra később.</translation>
<translation>Mégse</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>Eltávolítás</translation>
</message>
@@ -2031,7 +2142,7 @@ Kérjük, hogy próbálja újra később.</translation>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation>Beállítás szerkesztése</translation>
</message>
@@ -2177,20 +2288,43 @@ Kérjük, hogy próbálja újra később.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Fiók</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Általános</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Hang/videó</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Beépülő modul</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Fiók beállítások</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Általános</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Beépülő modul</translation>
</message>
@@ -2242,7 +2376,7 @@ Kérjük, hogy próbálja újra később.</translation>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation>Oldallap nézet be-/kikapcsolása</translation>
</message>
@@ -2265,33 +2399,28 @@ Kérjük, hogy próbálja újra később.</translation>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>A Jami névjegye</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Isten hozott</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation>Új Jami fiók létrehozása</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation>Fiók importálása más eszközről</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation>Fiók importálása biztonsági mentési fájlból</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation>Új SIP fiók létrehozása</translation>
</message>
diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index 5df925ba3a157ea093972e8b6428eef308aea2a1..57242d04e5b9c54c0c9f30581e3efbccfb91c03e 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Tentang Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Kirim</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Terima</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Tolak</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blokir</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Akun</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Akun</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Tentang Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index d4d7f38386577ab00da7773e501cbadd157b5016..fc3343e48e8cad06c1d6b9c9b4852bb53aaf432e 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Chiudi</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Aggiungi Account</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Rimuovi contatto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blocca contatto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profilo</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Crea un account Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Informazioni su Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Controlla automaticamente gli aggiornamenti</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@@ -1638,6 +1643,143 @@ Copia e condividi con i tuoi amici!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Nascondere la vista del chat</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Effettua videochiamata</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Effettua chiamata audio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Aggiungi alle conversazioni</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Sblocca contatto</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Invia</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Invia file</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Accetta</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Rifiuta</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blocca</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Scrivi un messaggio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Nota: un'interazione creerà un nuovo contatto.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Nota: puoi accettare automaticamente questo invito inviando un messaggio.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>ora</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Fallimento</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Riprova</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copia e condividi con i tuoi amici!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Profilo</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Generali</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Errore di rete</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Scattare una foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Annulla</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Profilo</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Generali</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Generali</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Informazioni su Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Benvenuto a</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts
index 3897b2c6ac4a1c22dc39fd767398d2d3d5d73e60..19398b28eae29378c9ef3839a0a382f0471d34ce 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -7,7 +7,7 @@
<translation>Informazioni su</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Chiudi</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Aggiungi account</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation> Contatti vietati</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>io</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Aggiungi alla conferenza</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Aggiungi alla conferenza</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Inizia la video chiamata</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Avvia chiamata audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Pulisci conversazione</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Rimuovi contatto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blocca contatto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profilo</translation>
</message>
@@ -331,7 +331,7 @@
<translation>ID del dispositivo</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Salva il nuovo nome del dispositivo</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Crea un account Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Informazioni su Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Controlla aggiornamenti automaticamente</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@@ -1638,6 +1643,143 @@ Copia e condividi con i tuoi amici!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Nascondi la vista della chat</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Effettua una videochiamata</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Metti la chiamata audio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Aggiungi alle conversazioni</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Contatto vietato</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Invia</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Invia File</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Accetta</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Rifiuto</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blocca</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Scrivi un messaggio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Nota: un'interazione creerà un nuovo contatto.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Nota: puoi accettare automaticamente questo invito inviando un messaggio.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>proprio adesso</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Fallito</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Elimina</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Riprova</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copia e condividi con i tuoi amici!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Account</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Generale</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Plugin</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Scegli plugin</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Errore di rete</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Scatta una foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Annulla</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Account</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Plugin</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Impostazioni dell 'account</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Plugin</translation>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Informazioni su Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Benvenuto su</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index 74b3b41e3485a61f57276ae6403d4196d18f2546..3d463349096198933e7e82c96462c39a13cb9f23 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -7,7 +7,7 @@
<translation>アプリについて</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>閉じる</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>アカウントを追加</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>禁止された連絡先</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>グループ通話に追加</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>グループ通話に追加</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>ビデオ通話を開始</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>音声通話を開始</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>会話履歴を削除</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>連絡先を削除</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>連絡先をブロック</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>プロフィール</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Jamiアカウントを作成</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Jamiについて</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>更新を自動的に確認する</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
@@ -1638,6 +1643,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>チャットを隠す</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>ビデオ通話を開始</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>音声通話を開始</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>会話に追加</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>送信</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>ファイルの送信</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>受け入れ</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>拒否</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>ブロック</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>メッセージを入力</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>通知: メッセージを送信すると、自動的にこの招待を受け入れます。</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>ちょうど今</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>削除</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>アカウント</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>全般</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>音声/動画</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>ネットワークエラー</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>撮影</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>キャンセル</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>アカウント</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>全般</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>音声/動画</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>全般</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Jamiについて</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>ようこそ</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index cc20f2e5e34caa439ff809365f5c1a080205c8d6..17acab71864b9dfa4d25a9699210c6f7473e2c18 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>차단한 연락처</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>프로필</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>확인</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>취소</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>계정</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>일반</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>오디오/비디오</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>사진 찍기</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>취소</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>일반</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index b0579c02f23391cfc13ac7b161ef690d19d963a5..1c21eb8b25b398e98e1689e7863391ab362c224b 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -7,7 +7,7 @@
<translation>Apie</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Užverti</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Pridėti paskyrą</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Užblokuoti adresatai</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Pridėti į konferenciją</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Pridėti į konferenciją</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Pradėti vaizdo skambutį</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Pradėti garso skambutį</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Išvalyti pokalbį</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Šalinti adresatą</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Užblokuoti adresatą</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profilis</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Įrenginio ID</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Susikurti Jami paskyrą</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Apie Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Automatiškai tikrinti ar yra naujinimų</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Gerai</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Atsisakyti</translation>
</message>
@@ -1638,6 +1643,143 @@ Nukopijuokite ir dalinkitės juo su draugais!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Slėpti pokalbio rodinį</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Pradėti vaizdo skambutį</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Pradėti garso skambutį</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Siųsti</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Siųsti failą</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Priimti</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Atmesti</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Užblokuoti</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Rašykite žinutę</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Pastaba: sąveika sukurs naują adresatą.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Pastaba: galite automatiškai priimti šį pakvietimą išsiųsdami žinutę.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>ką tik</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Nesėkmė</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Ištrinti</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Nukopijuokite ir dalinkitės juo su draugais!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Paskyra</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Bendra</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Garsas/Vaizdas</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Tinklo klaida</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Padaryti nuotrauką</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Atsisakyti</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Paskyra</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Bendra</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Garsas/Vaizdas</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Paskyros nustatymai</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Bendra</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Apie Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Sveiki atvykę į</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index 63ffc14a88fe6c13cad210586c7535fde629c760..bdd6a55beeec1dfc2640598eab66c0e4ceb2da0c 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -7,7 +7,7 @@
<translation>Tentang</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Batal</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Terima</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Hapus</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Akaun</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Utama</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Rangkaian gagal</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Batal</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Akaun</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Utama</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Utama</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index 4ee99c201f778eb69d50619843e9ef6b5874c46a..e99d34185239edd6bf53ddd81640a74871e8dc95 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -7,7 +7,7 @@
<translation>Om</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Lukk</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Bannlyste kontakter</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Legg til konferanse</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Legg til konferanse</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Fjern kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blokker kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Opprett en Jami-konto</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Se etter oppdateringer automatisk</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -1638,6 +1643,143 @@ Kopier og del det med dine venner!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Kopier og del det med dine venner!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Generell</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Lyd/bilde</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Nettverksfeil</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Ta bilde</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Generell</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Om Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Velkommen til</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nb_NO.ts b/translations/ring_client_windows_nb_NO.ts
index 2a6ba1dcdc01fd4524f1a9e1aada630a33510a0c..43a12caaeacee9bdc2834dcce02c3894a871da4b 100644
--- a/translations/ring_client_windows_nb_NO.ts
+++ b/translations/ring_client_windows_nb_NO.ts
@@ -9,7 +9,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
@@ -17,7 +17,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"></translation>
</message>
@@ -122,7 +122,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -130,13 +130,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
@@ -144,17 +144,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -162,7 +162,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -183,12 +183,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
@@ -201,27 +201,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
@@ -333,7 +333,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"></translation>
</message>
@@ -361,7 +361,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -384,7 +384,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -767,27 +767,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished">Avbryt</translation>
</message>
@@ -1639,6 +1644,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1871,17 +1990,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"></translation>
</message>
@@ -1920,14 +2039,6 @@ Please try again later.</source>
<translation>Avbryt</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1962,13 +2073,13 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"></translation>
</message>
@@ -1976,7 +2087,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"></translation>
</message>
@@ -2004,7 +2115,7 @@ Please try again later.</source>
<translation type="unfinished">Avbryt</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
@@ -2030,7 +2141,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"></translation>
</message>
@@ -2176,20 +2287,43 @@ Please try again later.</source>
<translation></translation>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
@@ -2241,7 +2375,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -2264,33 +2398,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index 8a60751094a83695aea1596ae1621c1b13105967..fb540c1f2837bb099486e91b573d925d9643cd62 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -7,7 +7,7 @@
<translation>Over</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Sluiten</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Account toevoegen</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Toevoegen aan groepsgesprek</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Toevoegen aan groepsgesprek</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Video-oproep starten</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Audio-oproep starten</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Gesprek wissen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Contact verwijderen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Contact blokkeren</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profiel</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Apparaat-ID</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Nieuwe apparaatnaam opslaan</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Een Jami-account aanmaken</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Over Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Automatisch op updates controleren</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Oké</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
@@ -1638,6 +1643,143 @@ Deel deze met uw vrienden!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Gespreksweergave verbergen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Video-oproep plaatsen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Audio-oproep plaatsen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Toevoegen aan gesprekken</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Contact ontbannen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Versturen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Bestand versturen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Accepteren</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Afwijzen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blokkeren</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Typ een bericht</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Let op: een interactie zal een nieuw contact aanmaken.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Let op: u kunt deze uitnodiging automatisch accepteren door een bericht te sturen.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>zonet</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Fout</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Verwijderen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Opnieuw proberen</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Deel deze met uw vrienden!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Account</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Algemeen</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Netwerkfout</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Foto nemen</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Annuleren</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Account</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Algemeen</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Accountinstellingen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Over Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Welkom bij</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nl_BE.ts b/translations/ring_client_windows_nl_BE.ts
index 601840108ba972ac6e11f00532ee3ec527716582..7bd1384050ec494bc6a4e7b9d62e060a002ef0db 100644
--- a/translations/ring_client_windows_nl_BE.ts
+++ b/translations/ring_client_windows_nl_BE.ts
@@ -7,7 +7,7 @@
<translation>Over</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Sluiten</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Account toevoegen</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Toevoegen aan groepsgesprek</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Toevoegen aan groepsgesprek</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Video-oproep starten</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Audio-oproep starten</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Gesprek wissen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Contact verwijderen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Contact blokkeren</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profiel</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Apparaats-ID</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Nieuwe apparaatsnaam opslaan</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Een Jami-account aanmaken</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Automatisch op updates controleren</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Oké</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
@@ -1638,6 +1643,143 @@ Deel hem met uw vrienden!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Deel hem met uw vrienden!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Account</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Algemeen</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Netwerkfout</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Foto trekken</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Annuleren</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Accountinstellingen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Over Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Welkom bij</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts
index d87a2c969cb3133a8fb3feb1a322a1e2d13ed29d..8714b97ee2e7c2c8b33069619646ab9df093e2fd 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Verwijderen</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Algemeen</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Algemeen</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_oc.ts b/translations/ring_client_windows_oc.ts
index 2d391c35e001e1b35a02115cc1bc1a4ea7b26a1a..60e2d5a883e4b8d27512c65d601dae6d97618baa 100644
--- a/translations/ring_client_windows_oc.ts
+++ b/translations/ring_client_windows_oc.ts
@@ -7,7 +7,7 @@
<translation>A prepaus</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Tampar</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Ajustar compte</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blocar contacte</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Crear un compte Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>A prepaus de Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>D’acòrdi</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Anullar</translation>
</message>
@@ -1638,6 +1643,143 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Enviar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Enviar un fichiè</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Acceptar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Refusar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blocar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Suprimir</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Tornar ensajar</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>General</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Extensions</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Error ret</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Prendre fòto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>anullar</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Compte</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>General</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Extension</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Extension</translation>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>A prepaus de Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>La benvenguda a Jami</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 2428e36d2460360968da22d80e02dac5bebcc99e..eccf065f894861980960f6db53cd2d7fdb7effb5 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>ਸੰਪਰਕ ਬਲਾਕ ਕਰੋ</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Jami ਖਾਤਾ ਬਣਾਓ</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>ਠੀਕ ਹੈ</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>ਰੱਦ ਕਰੋ</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>ਖਾਤਾ</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>ਸਧਾਰਨ</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>ਨੈੱਟਵਰਕ ਗੜਬੜ</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>ਫ਼ੋਟੋ ਖਿੱਚੋ</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>ਰੱਦ ਕਰੋ</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>ਸਧਾਰਨ</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Jami ਬਾਰੇ</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index 3acd4769d980a21ff2d50fb4e8d647efa499c5bf..244a1698665932223387892cbcbc8347a7da85d9 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -7,7 +7,7 @@
<translation>O programie</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Zamknij</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Dodaj Konto</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Zablokowane Kontakty</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Dodaj do rozmowy</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Dodaj do rozmowy</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Rozpocznij rozmowę wideo</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Rozpocznij połączenie głosowe</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Wyczyść rozmowę</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Usuń kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blokuj kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>ID Urządzenia</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Stwórz konto Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>O Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Automatycznie sprawdź po aktualizacje</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
@@ -1638,6 +1643,143 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Schowaj chat</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Rozpocznij rozmowę wideo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Wykonaj połączenie głosowe</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Dodaj do rozmowy</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Odblokuj konto</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Wyślij</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Wyślij plik</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Akceptuj</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Odmów</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blokuj</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Napisz wiadomość</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Uwaga: interakcja utworzy nowy kontakt.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Uwaga: możesz automatycznie zaakceptować to zaproszenie poprzez wysłanie wiadmości.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>teraz</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Nie powiodło się</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Usuń</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Ponów</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Generalne</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Wideo</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Błąd sieci</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Zrób zdjęcie</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Anuluj</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Konto</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Generalne</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Wideo</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Ustawienia Konta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Generalne</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>O Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Witaj!</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts
index d7bee0b04352c899be384e7ca4fbe9f36fc051b9..50a2985da1e8058187b41bb74c3fa210d2a3f645 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -7,7 +7,7 @@
<translation>O programie</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Zamknij</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Dodaj konto</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Dodaj do rozmowy</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Dodaj do rozmowy</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Rozpocznij rozmowę wideo</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Rozpocznij połączenie głosowe</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Wyczyść rozmowę</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Usuń kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blokuj kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Utwórz konto Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>O Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
@@ -1638,6 +1643,143 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Schowaj chat</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Dodaj do rozmowy</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Wyślij</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Wyślij plik</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Akceptuj</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Odmów</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blokuj</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Napisz wiadomość</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Usuń</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Ponów</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Generalne</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Błąd sieci</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Zrób zdjęcie</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Anuluj</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Konto</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Generalne</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Ustawienia Konta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Generalne</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>O Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Witaj!</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index bbe133765400b9308b6c563ac81c4859afee6add..b01d0d4ca6dc915de919d2453214a8007dfae576 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -7,7 +7,7 @@
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Fechar</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Adicionar Conta</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contactos Banidos</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Adicionar à conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Adicionar à conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Começar chamada de vídeo</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Começar chamada de áudio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Limpar conversação</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Remover contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquear contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>ID do dispositivo</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Guardar o novo nome do dispositivo</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Criar uma conta Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Verificar automaticamente se há atualizações</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -1638,6 +1643,143 @@ Copie e o partilhe-o com os seus amigos!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copie e o partilhe-o com os seus amigos!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Geral</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Áudio/Vídeo</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Erro de rede</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Tirar fotografia</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Configurações da Conta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Sobre o Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Bem-vindo(a) à</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts
index 1bb528c4185c5d6008e840aa24160f47d95c76e2..24badd330b98f97aba2ab02825549f1eccfd7698 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -7,7 +7,7 @@
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Fechar</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Adicionar Conta</translation>
</message>
@@ -33,12 +33,12 @@
<message>
<location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
<source>Audio Files</source>
- <translation type="unfinished"/>
+ <translation>Arquivos de Áudio</translation>
</message>
<message>
<location filename="../src/settingsview/components/AdvancedCallSettings.qml" line="67"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
</context>
<context>
@@ -54,12 +54,12 @@
<location filename="../src/settingsview/components/AdvancedJamiSecuritySettings.qml" line="94"/>
<location filename="../src/settingsview/components/AdvancedJamiSecuritySettings.qml" line="114"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
<message>
<location filename="../src/settingsview/components/AdvancedJamiSecuritySettings.qml" line="114"/>
<source>Key File</source>
- <translation type="unfinished"/>
+ <translation>Arquivo chave</translation>
</message>
</context>
<context>
@@ -88,12 +88,12 @@
<location filename="../src/settingsview/components/AdvancedSIPSecuritySettings.qml" line="112"/>
<location filename="../src/settingsview/components/AdvancedSIPSecuritySettings.qml" line="130"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
<message>
<location filename="../src/settingsview/components/AdvancedSIPSecuritySettings.qml" line="130"/>
<source>Key File</source>
- <translation type="unfinished"/>
+ <translation>Arquivo chave</translation>
</message>
</context>
<context>
@@ -101,7 +101,7 @@
<message>
<location filename="../src/settingsview/components/AdvancedSettings.qml" line="67"/>
<source>Advanced Account Settings</source>
- <translation type="unfinished"/>
+ <translation>Configurações avançadas de conta</translation>
</message>
</context>
<context>
@@ -109,18 +109,18 @@
<message>
<location filename="../src/wizardview/components/BackupKeyPage.qml" line="46"/>
<source>Jami archive files</source>
- <translation type="unfinished"/>
+ <translation>Arquivos Jami</translation>
</message>
<message>
<location filename="../src/wizardview/components/BackupKeyPage.qml" line="46"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
</context>
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contatos Banidos</translation>
</message>
@@ -128,41 +128,41 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
- <translation type="unfinished"/>
+ <translation>eu</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
- <translation type="unfinished"/>
+ <translation>está chamando você</translation>
</message>
</context>
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Adicionar a conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
- <translation type="unfinished"/>
+ <translation>Transferir esta chamada</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
- <translation type="unfinished"/>
+ <translation>Buscar contatos</translation>
</message>
</context>
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
- <translation type="unfinished"/>
+ <translation>Alternar para exibir o painel lateral</translation>
</message>
</context>
<context>
@@ -175,20 +175,20 @@
<message>
<location filename="../src/wizardview/components/CollapsiblePasswordWidget.qml" line="97"/>
<source>Confirm Password</source>
- <translation type="unfinished"/>
+ <translation>Confirmar senha</translation>
</message>
</context>
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Adicionar a conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
- <translation type="unfinished"/>
+ <translation>Transferir esta chamada</translation>
</message>
</context>
<context>
@@ -199,27 +199,27 @@
<translation>Iniciar videochamada</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Iniciar chamada de áudio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Eliminar a conversa</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Remover contato</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquear contato</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
@@ -229,12 +229,12 @@
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="81"/>
<source>Jami archive files</source>
- <translation type="unfinished"/>
+ <translation>Arquivos Jami</translation>
</message>
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="81"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="126"/>
@@ -249,7 +249,7 @@
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="153"/>
<source>Choose a name</source>
- <translation type="unfinished"/>
+ <translation>Escolha um nome</translation>
</message>
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="168"/>
@@ -259,7 +259,7 @@
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="168"/>
<source>Invalid name</source>
- <translation type="unfinished"/>
+ <translation>Nome inválido</translation>
</message>
<message>
<location filename="../src/wizardview/components/CreateAccountPage.qml" line="170"/>
@@ -294,12 +294,12 @@
<message>
<location filename="../src/settingsview/components/CurrentAccountSettings.qml" line="160"/>
<source>Jami archive files</source>
- <translation type="unfinished"/>
+ <translation>Arquivos Jami</translation>
</message>
<message>
<location filename="../src/settingsview/components/CurrentAccountSettings.qml" line="160"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
</context>
<context>
@@ -331,7 +331,7 @@
<translation>Id do Dispositivo</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -341,12 +341,12 @@
<message>
<location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="63"/>
<source>Jami archive files</source>
- <translation type="unfinished"/>
+ <translation>Arquivos Jami</translation>
</message>
<message>
<location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="63"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
<message>
<location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="87"/>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -442,17 +442,17 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="44"/>
<source>Open settings</source>
- <translation type="unfinished"/>
+ <translation>Abrir configurações</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="45"/>
<source>Close settings</source>
- <translation type="unfinished"/>
+ <translation>Fechar configurações</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="48"/>
<source>Authentication required</source>
- <translation type="unfinished"/>
+ <translation>Autenticação requerida</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="49"/>
@@ -467,7 +467,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="51"/>
<source>Authenticate</source>
- <translation type="unfinished"/>
+ <translation>Autenticado</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="52"/>
@@ -507,7 +507,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="53"/>
<source>In progress…</source>
- <translation type="unfinished"/>
+ <translation>Em progresso...</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="62"/>
@@ -765,27 +765,32 @@
<translation>Criar uma conta no Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Sobre Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Verificar automaticamente se há atualizações</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -1062,7 +1067,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="178"/>
<source>Mute</source>
- <translation type="unfinished"/>
+ <translation>Mudo</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="179"/>
@@ -1077,7 +1082,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="182"/>
<source>Resume</source>
- <translation type="unfinished"/>
+ <translation>Resumo</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="183"/>
@@ -1217,7 +1222,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="223"/>
<source>Server</source>
- <translation type="unfinished"/>
+ <translation>Servidor</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="224"/>
@@ -1459,7 +1464,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="296"/>
<source>Archive</source>
- <translation type="unfinished"/>
+ <translation>Arquivo</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="297"/>
@@ -1529,12 +1534,12 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="324"/>
<source>Change</source>
- <translation type="unfinished"/>
+ <translation>Mudar</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="325"/>
<source>Confirm</source>
- <translation type="unfinished"/>
+ <translation>Confirmar</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="326"/>
@@ -1564,7 +1569,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="335"/>
<source>Reset</source>
- <translation type="unfinished"/>
+ <translation>Resetar</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="336"/>
@@ -1574,12 +1579,12 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="337"/>
<source>Install plugin</source>
- <translation type="unfinished"/>
+ <translation>Instalar plugin</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="351"/>
<source>Save profile</source>
- <translation type="unfinished"/>
+ <translation>Salvar perfil</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="356"/>
@@ -1638,6 +1643,143 @@ Copie-o e compartilhe com seus amigos!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Ocultar visão do bate-papo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Fazer videochamada</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Fazer chamada de áudio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Adicionar às conversas</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Contato não banido</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Enviar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Enviar arquivo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Aceitar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Recusar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bloquear</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Digite uma mensagem</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Observação: uma interação criará um novo contato</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Observação: você pode aceitar automaticamente este convite enviando uma mensagem.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>Agora</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Falha</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Deletar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Tente novamente</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copie-o e compartilhe com seus amigos!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Geral</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Áudio/Vídeo</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Complementos</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1848,7 +1967,7 @@ Please try again later.</source>
<message>
<location filename="../src/settingsview/components/LinkedDevices.qml" line="108"/>
<source>Linked Devices</source>
- <translation type="unfinished"/>
+ <translation>Dispositivos Ligados</translation>
</message>
</context>
<context>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Erro de rede</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1958,16 +2069,16 @@ Please try again later.</source>
<message>
<location filename="../src/commoncomponents/PhotoboothView.qml" line="65"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Tirar foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2018,7 +2129,7 @@ Please try again later.</source>
<message>
<location filename="../src/settingsview/components/PluginListSettingsView.qml" line="85"/>
<source>All files</source>
- <translation type="unfinished"/>
+ <translation>Todos os arquivos</translation>
</message>
<message>
<location filename="../src/settingsview/components/PluginListSettingsView.qml" line="104"/>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,22 +2286,45 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Conta</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Geral</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Áudio/Vídeo</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Plugin</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Configurações da Conta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
- <translation type="unfinished"/>
+ <translation>Plugin</translation>
</message>
</context>
<context>
@@ -2240,9 +2374,9 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
- <translation type="unfinished"/>
+ <translation>Alternar para exibir o painel lateral</translation>
</message>
</context>
<context>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Sobre Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Bem-vindo à</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_pt_PT.ts b/translations/ring_client_windows_pt_PT.ts
index c8090548a8d30d44fe794babc35f37df9fa919d3..0f4ac67ea51348a8a9a578eb1e76bfd82943efda 100644
--- a/translations/ring_client_windows_pt_PT.ts
+++ b/translations/ring_client_windows_pt_PT.ts
@@ -7,7 +7,7 @@
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Fechar</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Adicionar Conta</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contactos Banidos</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Adicionar à conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Adicionar à conferência</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Começar chamada de vídeo</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Começar chamada de áudio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Limpar conversação</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Remover contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bloquear contacto</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Perfil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>ID do dispositivo</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Guardar o novo nome do dispositivo</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Criar uma conta Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Sobre o Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Verificar automaticamente se há atualizações</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -1638,6 +1643,143 @@ Copie e o partilhe-o com os seus amigos!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Ocultar visualização da conversa</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Fazer video-chamada</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Fazer chamada de áudio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Adicionar às conversas</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Desbanir contacto</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Enviar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Enviar ficheiro</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Aceitar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Recusar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bloquear</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Digite uma mensagem</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Nota: uma interação irá criar um contacto novo.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Nota: pode aceitar este convite automaticamente enviando uma mensagem.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>agora mesmo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Falha</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Eliminar</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Tentar novamente</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copie e o partilhe-o com os seus amigos!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Geral</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Áudio/Vídeo</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Erro de rede</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Tirar fotografia</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Cancelar</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Conta</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Geral</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Áudio/Vídeo</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Configurações da Conta</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Sobre o Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Bem-vindo(a) à</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index d3d4aa1a0fb499238386954e2543c9406fa08d04..93ddfa64766f78607f7b4aafbefa5903b4d52ebb 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -9,7 +9,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
@@ -17,7 +17,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"></translation>
</message>
@@ -122,7 +122,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -130,13 +130,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"></translation>
</message>
@@ -144,17 +144,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"></translation>
</message>
@@ -162,7 +162,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -183,12 +183,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"></translation>
</message>
@@ -201,27 +201,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blocați contactul</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
@@ -333,7 +333,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"></translation>
</message>
@@ -361,7 +361,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -384,7 +384,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"></translation>
</message>
@@ -767,27 +767,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -1639,6 +1644,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished">Șterge</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>General</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1871,17 +1990,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"></translation>
</message>
@@ -1920,14 +2039,6 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1962,13 +2073,13 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"></translation>
</message>
@@ -1976,7 +2087,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"></translation>
</message>
@@ -2004,7 +2115,7 @@ Please try again later.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
@@ -2030,7 +2141,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"></translation>
</message>
@@ -2176,20 +2287,43 @@ Please try again later.</source>
<translation></translation>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished">General</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished">General</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
@@ -2241,7 +2375,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"></translation>
</message>
@@ -2264,33 +2398,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</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 6f9fd1c4185ba2ed9455498d2bce6dffcdce6bc3..6e5836e56c8b802085f4f80bf7948599e8918579 100644
--- a/translations/ring_client_windows_ro_RO.ts
+++ b/translations/ring_client_windows_ro_RO.ts
@@ -7,7 +7,7 @@
<translation>Despre</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Închide</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Adaugă un Cont</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Contacte Blocate</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>eu</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation>te sună</translation>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Adaugă la conferință</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation>Redirecționează acest apel</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>Caută contacte</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation>Act/Dez panoul lateral</translation>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Adaugă la conferință</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation>Redirecționează acest apel</translation>
</message>
@@ -199,27 +199,27 @@
<translation>Începe un apel video</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Începe un apel audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Șterge conversația</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Șterge contactul</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blochează contactul</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>ID-ul dispozitivului</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Salvează noul nume al dispozitivului</translation>
</message>
@@ -359,7 +359,7 @@
<translation>Se creează contul...</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation>Înapoi la prima pagina</translation>
</message>
@@ -382,7 +382,7 @@
<translation>Se creează contul...</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation>Înapoi la prima pagina</translation>
</message>
@@ -765,27 +765,32 @@
<translation>Creează un cont Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Despre Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation>Refuză cererea de contact</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation>Acceptă cererea de contact</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Caută actualizările automat</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Renunță</translation>
</message>
@@ -1639,6 +1644,143 @@ Copiază-l și distribuie-l prietenilor!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation>Eroare la crearea contului. Verifică datele de autentificare.</translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Ascunde discuția</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Fă apel video</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Fă apel audio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Adaugă la conversații</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Deblochează contactul</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Trimite</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Trimite fișierul</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Acceptă</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Refuză</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blochează</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Scrie un mesaj</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Aviz: o acțiune va crea un nou contact.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Aviz: poți accepta automat această invitație trimițînd un mesaj.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>chiar acum</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Eșec</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Șterge</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Încearcă din nou</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copiază-l și distribuie-l prietenilor!</translation>
<translation>Refuză apelul</translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Cont</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Generale</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Extensii</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1873,17 +1992,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Alege extensia</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation>Întoarce-te la extensii</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation>Preferințe</translation>
</message>
@@ -1922,14 +2041,6 @@ Please try again later.</source>
<translation>Eroare de rețea</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation>Anulează apelul</translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1964,13 +2075,13 @@ Please try again later.</source>
<translation>Toate fișierele</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Fă o poză</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation>Repetă poza</translation>
</message>
@@ -1978,7 +2089,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation>Pornește/Oprește</translation>
</message>
@@ -2006,7 +2117,7 @@ Please try again later.</source>
<translation>Renunță</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>Dezinstalează</translation>
</message>
@@ -2032,7 +2143,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation>Modifică preferința</translation>
</message>
@@ -2178,20 +2289,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Cont</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Extensie</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Reglările Contului</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Extensie</translation>
</message>
@@ -2243,7 +2377,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation>Act/Dez panoul lateral</translation>
</message>
@@ -2266,33 +2400,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Despre Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Bine ai venit pe</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation>Creează un cont Jami nou</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation>Importă contul din alt dispozitiv</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation>Importă contul dintr-o copie de rezervă</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation>Creează un cont SIP nou</translation>
</message>
diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index 7dd046e59d7f0bbb5148f5f8afd32fd3888218af..a649b79c8d322c54c80be5d4642de64e7d2f8baf 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -7,7 +7,7 @@
<translation>О программе</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Добавить аккаунт</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Заблокированные контакты</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Добавить к конференции</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Добавить к конференции</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Начать видеовызов</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Начать голосовой вызов</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Очистить разговор</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Удалить контакт</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Заблокировать контакт</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Профиль</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Устройство ID</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Сохранить новое имя устройства</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Создать учётную запись Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>О программе Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Автоматически проверять наличие обновлений</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -1638,6 +1643,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Скрыть чат</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Сделать видеозвонок</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Сделать аудиозвонок</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Добавить к контактам</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Разблокировать контакт</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Отправить</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Отправить файл</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Принять</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Отказать</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Заблокировать</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Введите сообщение</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Примечание: при взаимодействии будет создан новый контакт.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Примечание: Вы можете автоматически принять это приглашение, отправив сообщение.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>прямо сейчас</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Ошибка</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Удалить</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Повторить</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Аккаунт</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Общие</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Аудио/Видео</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Выбрать дополнение</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Ошибка сети</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Сфотографировать</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Аккаунт</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Общие</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Аудио/Видео</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Дополнение</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Настройки аккаунта</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Общие</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Дополнение</translation>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>О программе Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Добро пожаловать в</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts
index 406d75dba98479d89936ce0dce355c65adf7affd..429590f2183507a98bde01fa0c1fb4a31642a8ad 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -7,7 +7,7 @@
<translation>О программе</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Добавить аккаунт</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Заблокированные Контакты</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Начать видеозвонок </translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Начать аудиозвонок</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Очистить переписку</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Удалить контакт</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Заблокировать контакт</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Профиль</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Id Устройства</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Сохранить новое имя устройства</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Создать учётную запись Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Да</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -1638,6 +1643,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Учётная запись</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Основные</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Звук/Видео</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Ошибка сети</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Сфотографировать</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Основные</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>О Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Добро пожаловать в</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index 650bea6769e3867539e9ffee49b00294af2c0b7a..13aa18788423cb92e2f05f8404e9d2f4ef66956d 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -7,7 +7,7 @@
<translation>O programe</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Zavrieť</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Pridať účet</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Blokované kontakty</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Pridať ku konferencii</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Pridať ku konferencii</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Začať video hovor</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Začať audio hovor</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Vymazať konverzáciu</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Odstrániť kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Zablokovať kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Id zariadenia</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Uložiť nový názov zariadenia</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Vytvoriť Jami účet</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>O programe Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Automaticky kontrolovať dostupnosť aktualizácií</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
@@ -1638,6 +1643,143 @@ Skopírujte ho a zdieľajte s priateľmi!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Skryť chat</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Uskutočniť video hovor</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Uskutočniť audio hovor</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Pridať ku kontaktom</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Odblokovať kontakt</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Poslať</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Poslať súbor</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Prijať</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Odmietnuť</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blokovať</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Napísať správu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Poznámka: vytvorí sa nový kontakt</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Poznámka: poslaním správy môžete automaticky prijať toto pozvanie</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>Práve teraz</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Chyba</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Vymazať</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Skúsiť znovu</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Skopírujte ho a zdieľajte s priateľmi!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Účet</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Všeobecné</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Chyba siete</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Zhotoviť fotografiu</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Zrušiť</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Účet</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Všeobecné</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Všeobecné</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>O programe Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Vitajte v</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index 6bf952c7bf191149f1e68722b5a57d43bf6cac92..6e1176fa13bc1244355aa8fbab6781e490f7c2a7 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -7,7 +7,7 @@
<translation>O Ring</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Zapri</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Zavrnjeni stiki</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Dodaj v konferenco</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Dodaj v konferenco</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Odstrani stik</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>V redu</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Skrij ogled pogovora</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Pošlji</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Sprejmi</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Zavrni</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blokiraj</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Tipkaj sporočilo</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Pobriši</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Račun</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Splošno</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Avdio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation>Napaka mreže</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Naredi sliko</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Prekliči</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Račun</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Splošno</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Avdio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Dobrodošli v</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index a4327bd36ca718b81d632a79621a2e723507463f..498645d6d50a228b394b940fb455cdf21ca2ce89 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -7,7 +7,7 @@
<translation>Mbi</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Mbylle</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Shtoni Llogari</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Kontakte të Dëbuar</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>unë</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation>po ju thërret</translation>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Shtoje te konferenca</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation>Shpërngule këtë thirrje</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>Kërko te kontaktet</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Shtoje te konferenca</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation>Shpërngule këtë thirrje</translation>
</message>
@@ -199,27 +199,27 @@
<translation>Filloni thirrje video</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Filloni thirrje audio</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Spastroje bisedën</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Hiqe kontaktin</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Bllokojeni kontaktin</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>ID pajisjeje</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Ruani emrin e pajisjes së re</translation>
</message>
@@ -359,7 +359,7 @@
<translation>Po prodhohet llogari…</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation>Mbrapsht te faqja e mirëseardhjes</translation>
</message>
@@ -382,7 +382,7 @@
<translation>Po prodhohet llogari…</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation>Mbrapsht te faqja e mirëseardhjes</translation>
</message>
@@ -765,27 +765,32 @@
<translation>Krijoni një llogari Jami</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Mbi Jami-n</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation>Hidhe poshtë kërkesën për kontakt</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation>Pranoni kërkesë kontakti</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Kontrollo vetvetiu për përditësime</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Anuloje</translation>
</message>
@@ -1639,6 +1644,143 @@ Kopjojeni dhe jepuani shokëve!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation>Gabim gjatë krijimit të llogarisë tuaj. Kontrolloni kredencialet tuaja.</translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Fshihe pamjen fjalosje</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Bëni një thirrje video</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Bëni një thirrje audio</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Shtoje te biseda</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Hiqja dëbimin kontaktit</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Dërgoje</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Dërgo kartelë</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Pranoje</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Hidhe tej</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Bllokoje</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Shtypni një mesazh</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Shënim: një ndërveprim do të krijojë një kontakt të ri.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Shënim: mund ta pranoni automatikisht këtë ftesë duke dërguar një mesazh.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>mu tani</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Dështim</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Fshije</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Riprovoni</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation>Hidh poshtë kërkesën për thirrje</translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Llogari</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Të përgjithshme</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Audio/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Shtojca</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1873,17 +1992,17 @@ Ju lutemi, riprovoni më vonë.</translation>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Zgjidhni shtojcë</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation>Kthehu te lista e shtojcave</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation>Parapëlqime</translation>
</message>
@@ -1922,14 +2041,6 @@ Ju lutemi, riprovoni më vonë.</translation>
<translation>Gabim rrjeti</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation>Anuloje thirrjen</translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1964,13 +2075,13 @@ Ju lutemi, riprovoni më vonë.</translation>
<translation>Krejt kartelat</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Bëni një foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation>Ribëjeni foton</translation>
</message>
@@ -1978,7 +2089,7 @@ Ju lutemi, riprovoni më vonë.</translation>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation>Ngarkoje/Shkarkoje</translation>
</message>
@@ -2006,7 +2117,7 @@ Ju lutemi, riprovoni më vonë.</translation>
<translation>Anuloje</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>Çinstaloje</translation>
</message>
@@ -2032,7 +2143,7 @@ Ju lutemi, riprovoni më vonë.</translation>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation>Përpunoni parapëlqime</translation>
</message>
@@ -2178,20 +2289,43 @@ Ju lutemi, riprovoni më vonë.</translation>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Llogari</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Të përgjithshme</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Audio/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Shtojcë</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Rregullime Llogarie</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Të përgjithshme</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Shtojcë</translation>
</message>
@@ -2243,7 +2377,7 @@ Ju lutemi, riprovoni më vonë.</translation>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2266,33 +2400,28 @@ Ju lutemi, riprovoni më vonë.</translation>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Mbi Jami-n</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Mirë se vini te</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation>Krijoni llogari Jami të re</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation>Importoni llogari nga një tjetër pajisje</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation>Importoni llogari prej kartele kopjeruajtje</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation>Krijoni llogari SIP të re</translation>
</message>
diff --git a/translations/ring_client_windows_sr@latin.ts b/translations/ring_client_windows_sr@latin.ts
index 18c00500d0779cfffe4ed908454bd98c1da13256..780444745e5af21b67cbcb2382fd61d9e26c3950 100644
--- a/translations/ring_client_windows_sr@latin.ts
+++ b/translations/ring_client_windows_sr@latin.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Napravi Jami profil</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Otkaži</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>Otkaži</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index 42e67b0bf77d8d6984fd42168418529d1efd7357..25470dfc76384b3767a7e0762d2739eb981e7311 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -7,7 +7,7 @@
<translation>Om</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Stäng</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Bannlysta kontakter</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>jag</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Lägg till i konferensen</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Lägg till i konferensen</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Rensa konversation</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Ta bort kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Blockera kontakt</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -682,7 +682,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="214"/>
<source>Create a rendezvous point</source>
- <translation type="unfinished"/>
+ <translation>Skapa en mötesplats</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="217"/>
@@ -702,7 +702,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="306"/>
<source>Enter the PIN from another configured Jami account. Use the "Link Another Device" feature to obtain a PIN.</source>
- <translation type="unfinished"/>
+ <translation>Ange PIN-koden från ett annat konfigurerat Jami-konto. Använd "Koppla en annan enhet", för att få din PIN-kod.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="308"/>
@@ -765,27 +765,32 @@
<translation>Skapa ett Jami-konto</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Om Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Sök automatiskt efter uppdateringar</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -1157,7 +1162,7 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="202"/>
<source>Enter Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>Ange URL till Jami Account Management Server (JAMS)</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="203"/>
@@ -1172,12 +1177,12 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="205"/>
<source>Enter your JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>Ange dina Jams-inloggningsdata</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="206"/>
<source>Connect</source>
- <translation type="unfinished"/>
+ <translation>Anslut</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="208"/>
@@ -1474,17 +1479,17 @@
<message>
<location filename="../src/constant/JamiStrings.qml" line="299"/>
<source>You can obtain an archive by clicking on "Backup account" in the account settings. This will create a .gz file on your device.</source>
- <translation type="unfinished"/>
+ <translation>Du kan få ett arkiv genom att klicka på "Säkerhetskopiera konto" i kontoinställningarna. Det kommer att skapa en .gz-fil på din enhet.</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="302"/>
<source>Restore an account from backup</source>
- <translation type="unfinished"/>
+ <translation>Återställ ett konto från en säkerhetskopia</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="305"/>
<source>Enter Jami account password</source>
- <translation type="unfinished"/>
+ <translation>Ange lösenordet för ditt Jami-konto</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="314"/>
@@ -1616,7 +1621,7 @@ Kopiera och dela det med dina vänner!</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="370"/>
<source>Advanced features</source>
- <translation type="unfinished"/>
+ <translation>Avancerade funktioner</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="371"/>
@@ -1626,7 +1631,7 @@ Kopiera och dela det med dina vänner!</translation>
<message>
<location filename="../src/constant/JamiStrings.qml" line="372"/>
<source>Connect to a JAMS server</source>
- <translation type="unfinished"/>
+ <translation>Anslut till en JAMS-server</translation>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="374"/>
@@ -1638,6 +1643,143 @@ Kopiera och dela det med dina vänner!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Dölj chattvyn</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Placera videosamtal</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Placera röstsamtal</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Lägg till i konversationer</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Avblockera kontakt</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Skicka</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Skicka fil</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Acceptera</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Neka</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Blockera</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Skriv ett meddelande</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Notera att interaktion kommer att skapa en ny kontakt.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Notera att du kan acceptera denna inbjudan automatiskt, genom att skicka ett meddelande.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>just nu</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Fel</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Ta bort</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Försök igen</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Kopiera och dela det med dina vänner!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Allmänt</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Ljud/Video</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>Insticksmoduler</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>Välj insticksmodul</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Nätverksfel</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Ta ett foto</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Avbryt</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Konto</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Allmänt</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Ljud/Video</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>Insticksmodul</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>Insticksmodul</translation>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Om Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Välkommen till</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_ta.ts b/translations/ring_client_windows_ta.ts
index f4b0f48a9e2dc0bc79641d9f8246b4efe48b0f59..3ef1d5b00c47bb158351450c0c1010e022e718c3 100644
--- a/translations/ring_client_windows_ta.ts
+++ b/translations/ring_client_windows_ta.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>பொது</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>பொது</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>பொது</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index dec05c117b894ea10c26aaed93ad1ba6e9204f09..934d4d84c40b21361f569f53ed4a046af8880a16 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -7,7 +7,7 @@
<translation>Hakkında</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Kapat</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Hesap Ekle</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Engellenmiş Kişiler</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Konferansa ekle</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Konferansa ekle</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Görüntülü arama başlat</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Sesli arama başlat</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>Konuşmayı temizle</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Kişiyi kaldır</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Kişiyi engelle</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@@ -331,7 +331,7 @@
<translation>Aygıt Kimliği</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>Yeni cihaz adını kaydet</translation>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Bir Jami hesabı oluştur</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Jami Hakkında</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Güncellemeleri kendiliğinden denetle</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Tamam</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
@@ -1638,6 +1643,143 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Konuşma görünümünü gizle</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Görüntülü arama yeri</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Sesli arama yeri </translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Konuşma ekle</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Kişinin engelini kaldır</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Gönder</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Dosya gönder</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Kabul et</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Geri Çevir</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Engelleme</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Bir ileti yaz</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>No: etkileşim yeni bir kişi oluşturacaktır.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Note: Bir ileti göndererek bu davetiyeyi otomatik olarak kabul edebilirsiniz.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>Şu an</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Başarısız</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Sil</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Yeniden dene</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Hesap</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Genel</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Ses/Görüntü</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Ağ hatası</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Fotoğraf çek</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>İptal</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Hesap</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Genel</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Ses/Görüntü</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>Hesap Ayarları</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Jami Hakkında</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Hoş Geldiniz</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_tr_TR.ts b/translations/ring_client_windows_tr_TR.ts
index a48ac54fc3398012083e1eadde7b95557e1c75ea..aed643c574039aae644393bd17e7b9aa1029dc2a 100644
--- a/translations/ring_client_windows_tr_TR.ts
+++ b/translations/ring_client_windows_tr_TR.ts
@@ -7,7 +7,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Jami Hakkında</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Jami Hakkında</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 8137da51ce18c5cc5cd497b36eaffb253a905246..12621f0491ab54bf58b285161ee202b945b5cb92 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -7,7 +7,7 @@
<translation>Про программу</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>Закрити</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>Заблоковані контакти</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>Додати до конференції</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>Додати до конференції</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>Видалити контакт</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>Заблокувати контакт</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>Профіль</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation>Створити обліковий запис Джамі</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>Про Джамі</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>Автоматично перевіряти оновлення</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>Ок</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>Відміна</translation>
</message>
@@ -1638,6 +1643,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>Сховати вікно чату</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>Почати відео дзвінок</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>Почати аудіо дзвінок</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>Додати до розмови</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>Розблокувати контакт</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>Відправити</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>Відправити файл</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>Прийняти</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>Скидання</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>Заблокувати</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>Набрати повідомлення</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>Зверніть увагу: взаємодія створить новий контакт</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>Зважте: ви можете автоматично прийняти це запрошення, направивши повідомлення.</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>щойно</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>Невдача</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>Видалити</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>Спробувати ще</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1755,29 +1897,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>Аккаунт</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>Головні</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>Аудіо/Відео</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1870,17 +1989,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1919,14 +2038,6 @@ Please try again later.</source>
<translation>Збій мережі</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1961,13 +2072,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>Зняти фото</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1975,7 +2086,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2003,7 +2114,7 @@ Please try again later.</source>
<translation>Відміна</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2029,7 +2140,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2175,20 +2286,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>Аккаунт</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>Головні</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>Аудіо/Відео</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>Головні</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2240,7 +2374,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2263,33 +2397,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>Про Джамі</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>Вітаємо у</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_vi.ts b/translations/ring_client_windows_vi.ts
index bb0a463729c1035ca9d45ea7051eb11a35cfcab6..755c55044bec46b71dca47a5d6ac2d072dd94c4f 100644
--- a/translations/ring_client_windows_vi.ts
+++ b/translations/ring_client_windows_vi.ts
@@ -7,7 +7,7 @@
<translation>Thông tin phần mềm</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>Thêm tài khoản</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation>Bắt đầu cuộc gọi hình ảnh</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>Bắt đầu cuộc gọi âm thanh</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation type="unfinished"/>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation type="unfinished"/>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index d9d7c909210b59b17f0cf10227aa754f7b6a5e48..6f917f4077ef9e98924cbf3605163d62f7a0618b 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -7,7 +7,7 @@
<translation>關於</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation type="unfinished"/>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation type="unfinished"/>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation type="unfinished"/>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation type="unfinished"/>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation type="unfinished"/>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation type="unfinished"/>
</message>
@@ -199,27 +199,27 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>個人檔案</translation>
</message>
@@ -331,7 +331,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation type="unfinished"/>
</message>
@@ -359,7 +359,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -382,7 +382,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation type="unfinished"/>
</message>
@@ -765,27 +765,32 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
- <source>Decline contact request</source>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <source>Decline contact request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>自動檢查更新</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>確定</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -1637,6 +1642,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>發送</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>拒絕</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>刪除</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1754,29 +1896,6 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>帳號</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>通用</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>音訊/視訊</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1869,17 +1988,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation type="unfinished"/>
</message>
@@ -1918,14 +2037,6 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1960,13 +2071,13 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation type="unfinished"/>
</message>
@@ -1974,7 +2085,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation type="unfinished"/>
</message>
@@ -2002,7 +2113,7 @@ Please try again later.</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation type="unfinished"/>
</message>
@@ -2028,7 +2139,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation type="unfinished"/>
</message>
@@ -2174,20 +2285,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>帳號</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>通用</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>音訊/視訊</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>通用</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation type="unfinished"/>
</message>
@@ -2239,7 +2373,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation type="unfinished"/>
</message>
@@ -2262,33 +2396,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index d44677fcd6e68e413b2aecc927bfec4e2fb099d7..77231dc1255775afe23c57f25a1bb5d40d146782 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -7,7 +7,7 @@
<translation>关于</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>关闭</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>添加账户</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>已屏蔽的联系人</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>我</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation>正在呼叫您</translation>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>添加至会议</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation>转接呼叫</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>搜索联系人</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation>切换显示侧面板</translation>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>添加至会议</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation>转接呼叫</translation>
</message>
@@ -199,27 +199,27 @@
<translation>发起视频通话</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>发起语音通话</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>清除会话</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>删除联系人</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>屏蔽联系人</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>账户资料</translation>
</message>
@@ -331,7 +331,7 @@
<translation>设备 id</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>保存新设备名称 </translation>
</message>
@@ -359,7 +359,7 @@
<translation>正在生成账户…</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation>返回欢迎页面</translation>
</message>
@@ -382,7 +382,7 @@
<translation>正在生成账户…</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation>返回欢迎页面</translation>
</message>
@@ -765,27 +765,32 @@
<translation>创建 Jami 账户</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>关于 Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation>拒绝联系人请求</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation>接受联系人请求</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>自动检查更新</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>确定</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -1639,6 +1644,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation>创建账户时出错。请检查您的凭据。</translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>隐藏聊天界面</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>发起视频通话</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>发起语音通话</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>添加到会话</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>取消屏蔽联系人</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>发送</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>发送文件</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>接收</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>拒接</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>屏蔽</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>输入信息</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>注：交互将创建一个新的联系人。</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>注：您可以通过发送消息自动接受此邀请。</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>刚才</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>失败</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>删除</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>重试</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copy and share it with your friends!</source>
<translation>拒绝呼叫请求</translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>账户</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>通用</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>音频/视频</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>插件</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1873,17 +1992,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>选择插件</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation>返回插件列表</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation>偏好</translation>
</message>
@@ -1922,14 +2041,6 @@ Please try again later.</source>
<translation>网络错误</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation>取消呼叫</translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1964,13 +2075,13 @@ Please try again later.</source>
<translation>所有文件</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>拍照</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation>重拍照片</translation>
</message>
@@ -1978,7 +2089,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation>加载/取消加载</translation>
</message>
@@ -2006,7 +2117,7 @@ Please try again later.</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>卸载</translation>
</message>
@@ -2032,7 +2143,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation>编辑偏好</translation>
</message>
@@ -2178,20 +2289,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>账户</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>通用</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>音频/视频</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>插件</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>账户设置</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>通用</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>插件</translation>
</message>
@@ -2243,7 +2377,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation>切换显示侧面板</translation>
</message>
@@ -2266,33 +2400,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>关于 Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>欢迎来到</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation>创建新的 Jami 账户</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation>从其他设备导入账户</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation>从备份文件导入账户</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation>创建新的 SIP 账户</translation>
</message>
diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts
index 1d8423c117e007a9f09ab7f268d9eb6d181b93f5..4d8f98fa1ced8a52f96f74a537a326889570ac8c 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -7,7 +7,7 @@
<translation>關於</translation>
</message>
<message>
- <location filename="../src/mainview/components/AboutPopUp.qml" line="307"/>
+ <location filename="../src/mainview/components/AboutPopUp.qml" line="308"/>
<source>Close</source>
<translation>關閉</translation>
</message>
@@ -15,7 +15,7 @@
<context>
<name>AccountComboBoxPopup</name>
<message>
- <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="165"/>
+ <location filename="../src/mainview/components/AccountComboBoxPopup.qml" line="163"/>
<source>Add Account</source>
<translation>新增帳號</translation>
</message>
@@ -120,7 +120,7 @@
<context>
<name>BannedContacts</name>
<message>
- <location filename="../src/settingsview/components/BannedContacts.qml" line="105"/>
+ <location filename="../src/settingsview/components/BannedContacts.qml" line="101"/>
<source>Banned Contacts</source>
<translation>黑名單聯絡人</translation>
</message>
@@ -128,13 +128,13 @@
<context>
<name>CallAdapter</name>
<message>
- <location filename="../src/calladapter.cpp" line="279"/>
- <location filename="../src/calladapter.cpp" line="369"/>
+ <location filename="../src/calladapter.cpp" line="270"/>
+ <location filename="../src/calladapter.cpp" line="351"/>
<source>me</source>
<translation>我</translation>
</message>
<message>
- <location filename="../src/calladapter.cpp" line="333"/>
+ <location filename="../src/calladapter.cpp" line="315"/>
<source>is calling you</source>
<translation>正在與您通話</translation>
</message>
@@ -142,17 +142,17 @@
<context>
<name>CallAdvancedOptions</name>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Add to conference</source>
<translation>加入會議</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="90"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="85"/>
<source>Transfer this call</source>
<translation>轉送此通話</translation>
</message>
<message>
- <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="108"/>
+ <location filename="../src/mainview/components/CallAdvancedOptions.qml" line="103"/>
<source>Search contacts</source>
<translation>搜尋聯絡人</translation>
</message>
@@ -160,7 +160,7 @@
<context>
<name>CallOverlay</name>
<message>
- <location filename="../src/mainview/components/CallOverlay.qml" line="179"/>
+ <location filename="../src/mainview/components/CallOverlay.qml" line="184"/>
<source>Toggle to display side panel</source>
<translation>切換以顯示側邊面板</translation>
</message>
@@ -181,12 +181,12 @@
<context>
<name>ContactPicker</name>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Add to conference</source>
<translation>加入會議</translation>
</message>
<message>
- <location filename="../src/mainview/components/ContactPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/ContactPicker.qml" line="85"/>
<source>Transfer this call</source>
<translation>轉送此通話</translation>
</message>
@@ -199,27 +199,27 @@
<translation>開始視訊通話</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="47"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="48"/>
<source>Start audio call</source>
<translation>開始音訊通話</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="56"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="58"/>
<source>Clear conversation</source>
<translation>清除對話</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="65"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="67"/>
<source>Remove contact</source>
<translation>移除聯絡人</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="103"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="109"/>
<source>Block contact</source>
<translation>阻擋連絡人</translation>
</message>
<message>
- <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="111"/>
+ <location filename="../src/mainview/components/ConversationSmartListContextMenu.qml" line="117"/>
<source>Profile</source>
<translation>介紹</translation>
</message>
@@ -331,7 +331,7 @@
<translation>裝置 Id</translation>
</message>
<message>
- <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="153"/>
+ <location filename="../src/settingsview/components/DeviceItemDelegate.qml" line="143"/>
<source>Save new device name</source>
<translation>儲存新裝置名稱</translation>
</message>
@@ -359,7 +359,7 @@
<translation>正在生成帳號……</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="203"/>
+ <location filename="../src/wizardview/components/ImportFromBackupPage.qml" line="200"/>
<source>Back to welcome page</source>
<translation>回到歡迎頁面</translation>
</message>
@@ -382,7 +382,7 @@
<translation>正在生成帳號……</translation>
</message>
<message>
- <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="178"/>
+ <location filename="../src/wizardview/components/ImportFromDevicePage.qml" line="175"/>
<source>Back to welcome page</source>
<translation>回到歡迎頁面</translation>
</message>
@@ -765,27 +765,32 @@
<translation>建立 Jami 帳號</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="380"/>
+ <location filename="../src/constant/JamiStrings.qml" line="378"/>
+ <source>About Jami</source>
+ <translation>關於 Jami</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="381"/>
<source>Decline contact request</source>
<translation>拒絕聯絡人請求</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="381"/>
+ <location filename="../src/constant/JamiStrings.qml" line="382"/>
<source>Accept contact request</source>
<translation>接受聯絡人請求</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="384"/>
+ <location filename="../src/constant/JamiStrings.qml" line="385"/>
<source>Automatically check for updates</source>
<translation>自動檢查更新</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="387"/>
+ <location filename="../src/constant/JamiStrings.qml" line="388"/>
<source>Ok</source>
<translation>確定</translation>
</message>
<message>
- <location filename="../src/constant/JamiStrings.qml" line="388"/>
+ <location filename="../src/constant/JamiStrings.qml" line="389"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -1639,6 +1644,143 @@ Copy and share it with your friends!</source>
<source>Error while creating your account. Check your credentials.</source>
<translation>建立您的帳號時發生錯誤。請檢查您的憑證。</translation>
</message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="392"/>
+ <source>Hide chat view</source>
+ <translation>隱藏聊天視窗</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="393"/>
+ <source>Place video call</source>
+ <translation>撥出視訊通話</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="394"/>
+ <source>Place audio call</source>
+ <translation>開始語音通話</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="395"/>
+ <source>Add to conversations</source>
+ <translation>新增到對話中</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="396"/>
+ <source>Unban contact</source>
+ <translation>取消封鎖聯絡人</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="397"/>
+ <source>Send</source>
+ <translation>傳送</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="398"/>
+ <source>Options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="399"/>
+ <source>Jump to latest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="400"/>
+ <source>Send file</source>
+ <translation>傳送檔案</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="401"/>
+ <source>Leave video message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="402"/>
+ <source>Leave audio message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="403"/>
+ <location filename="../src/constant/JamiStrings.qml" line="417"/>
+ <source>Accept</source>
+ <translation>接聽</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="404"/>
+ <location filename="../src/constant/JamiStrings.qml" line="418"/>
+ <source>Refuse</source>
+ <translation>拒絕</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="405"/>
+ <source>Block</source>
+ <translation>阻擋</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="406"/>
+ <source>Type a message</source>
+ <translation>輸入訊息</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="407"/>
+ <source>Note: an interaction will create a new contact.</source>
+ <translation>注意：互動將會建立新聯絡人。</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="408"/>
+ <source>is not in your contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="409"/>
+ <source>Note: you can automatically accept this invitation by sending a message.</source>
+ <translation>注意：您可以透過傳送訊息來自動接受此邀請。</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="410"/>
+ <source>days ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="411"/>
+ <source>day ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="412"/>
+ <source>hours ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="413"/>
+ <source>hour ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="414"/>
+ <source>minutes ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="415"/>
+ <source>just now</source>
+ <translation>現在</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="416"/>
+ <source>Failure</source>
+ <translation>失敗</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="419"/>
+ <source>Delete</source>
+ <translation>刪除</translation>
+ </message>
+ <message>
+ <location filename="../src/constant/JamiStrings.qml" line="420"/>
+ <source>Retry</source>
+ <translation>重試</translation>
+ </message>
</context>
<context>
<name>JamiUserIdentity</name>
@@ -1756,29 +1898,6 @@ Copy and share it with your friends!</source>
<translation>拒絕通話請求</translation>
</message>
</context>
-<context>
- <name>LeftPanelView</name>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="61"/>
- <source>Account</source>
- <translation>帳號</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="74"/>
- <source>General</source>
- <translation>一般</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="87"/>
- <source>Audio/Video</source>
- <translation>音訊／視訊</translation>
- </message>
- <message>
- <location filename="../src/settingsview/components/LeftPanelView.qml" line="100"/>
- <source>Plugins</source>
- <translation>外掛程式</translation>
- </message>
-</context>
<context>
<name>LinkDeviceDialog</name>
<message>
@@ -1873,17 +1992,17 @@ Please try again later.</source>
<context>
<name>MediaHandlerPicker</name>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="89"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="85"/>
<source>Choose plugin</source>
<translation>選擇外掛程式</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="151"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="143"/>
<source>Go back to plugins list</source>
<translation>回到外掛程式清單</translation>
</message>
<message>
- <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="195"/>
+ <location filename="../src/mainview/components/MediaHandlerPicker.qml" line="183"/>
<source>Preferences</source>
<translation>偏好設定</translation>
</message>
@@ -1922,14 +2041,6 @@ Please try again later.</source>
<translation>網路錯誤</translation>
</message>
</context>
-<context>
- <name>OutgoingCallPage</name>
- <message>
- <location filename="../src/mainview/components/OutgoingCallPage.qml" line="113"/>
- <source>Cancel the call</source>
- <translation>取消通話</translation>
- </message>
-</context>
<context>
<name>ParticipantContextMenu</name>
<message>
@@ -1964,13 +2075,13 @@ Please try again later.</source>
<translation>所有檔案</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="198"/>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="206"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="196"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="204"/>
<source>Take photo</source>
<translation>照相</translation>
</message>
<message>
- <location filename="../src/commoncomponents/PhotoboothView.qml" line="203"/>
+ <location filename="../src/commoncomponents/PhotoboothView.qml" line="201"/>
<source>Retake photo</source>
<translation>重拍照片</translation>
</message>
@@ -1978,7 +2089,7 @@ Please try again later.</source>
<context>
<name>PluginItemDelegate</name>
<message>
- <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="78"/>
+ <location filename="../src/settingsview/components/PluginItemDelegate.qml" line="79"/>
<source>Load/Unload</source>
<translation>載入／取消載入</translation>
</message>
@@ -2006,7 +2117,7 @@ Please try again later.</source>
<translation>取消</translation>
</message>
<message>
- <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="164"/>
+ <location filename="../src/settingsview/components/PluginListPreferencesView.qml" line="168"/>
<source>Uninstall</source>
<translation>解除安裝</translation>
</message>
@@ -2032,7 +2143,7 @@ Please try again later.</source>
<context>
<name>PreferenceItemDelegate</name>
<message>
- <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="123"/>
+ <location filename="../src/commoncomponents/PreferenceItemDelegate.qml" line="117"/>
<source>Edit preference</source>
<translation>編輯偏好設定</translation>
</message>
@@ -2178,20 +2289,43 @@ Please try again later.</source>
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>SettingsMenu</name>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="34"/>
+ <source>Account</source>
+ <translation>帳號</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="36"/>
+ <source>General</source>
+ <translation>一般</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="38"/>
+ <source>Audio/Video</source>
+ <translation>音訊／視訊</translation>
+ </message>
+ <message>
+ <location filename="../src/settingsview/components/SettingsMenu.qml" line="40"/>
+ <source>Plugin</source>
+ <translation>外掛程式</translation>
+ </message>
+</context>
<context>
<name>SettingsView</name>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="153"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="152"/>
<source>Account Settings</source>
<translation>帳號設定</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="155"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="154"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/settingsview/SettingsView.qml" line="159"/>
+ <location filename="../src/settingsview/SettingsView.qml" line="158"/>
<source>Plugin</source>
<translation>外掛程式</translation>
</message>
@@ -2243,7 +2377,7 @@ Please try again later.</source>
<context>
<name>UserInfoCallPage</name>
<message>
- <location filename="../src/mainview/components/UserInfoCallPage.qml" line="66"/>
+ <location filename="../src/mainview/components/UserInfoCallPage.qml" line="69"/>
<source>Toggle to display side panel</source>
<translation>切換以顯示側邊面板</translation>
</message>
@@ -2266,33 +2400,28 @@ Please try again later.</source>
</context>
<context>
<name>WelcomePage</name>
- <message>
- <location filename="../src/mainview/components/WelcomePage.qml" line="154"/>
- <source>About Jami</source>
- <translation>關於 Jami</translation>
- </message>
<message>
<location filename="../src/wizardview/components/WelcomePage.qml" line="55"/>
<source>Welcome to</source>
<translation>歡迎來到</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="88"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="85"/>
<source>Create new Jami account</source>
<translation>建立新 Jami 帳號</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="128"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="125"/>
<source>Import account from other device</source>
<translation>從其他裝置匯入</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="148"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="145"/>
<source>Import account from backup file</source>
<translation>從備份檔案匯入</translation>
</message>
<message>
- <location filename="../src/wizardview/components/WelcomePage.qml" line="221"/>
+ <location filename="../src/wizardview/components/WelcomePage.qml" line="218"/>
<source>Create new SIP account</source>
<translation>建立新 SIP 帳號</translation>
</message>