diff --git a/translations/lrc_ar.ts b/translations/lrc_ar.ts
index 496b57ecbc9b7e85a037c067e34a0f0cb68c639b..64a7793aa7fbe6c9de3dc81f7469f10f9b8a9750 100644
--- a/translations/lrc_ar.ts
+++ b/translations/lrc_ar.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>إزالة المØادثة</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>اختياري</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>اسم المستخدم مستخدم بالÙعل</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>تصدير</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>اØØ°Ù</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>رÙض</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Øسابك مشارك Ùقط مع جهات إتصالك</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ar_EG.ts b/translations/lrc_ar_EG.ts
index bc999a070e149aee46e6d9f40ed893beaf975b5f..4609665641d4945e286a6135655ecc9587608483 100644
--- a/translations/lrc_ar_EG.ts
+++ b/translations/lrc_ar_EG.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>إزالة المØادثة</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>اختياري</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>اسم المستخدم مستخدم بالÙعل</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>تصدير</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>اØØ°Ù</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>رÙض</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Øسابك مشارك Ùقط مع جهات إتصالك</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_az.ts b/translations/lrc_az.ts
index 7b2ab00213176027df71860fe2b01d01bedfcb6a..5992644bf4f2642f3e0a756058ee8eea5d6455d2 100644
--- a/translations/lrc_az.ts
+++ b/translations/lrc_az.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_be.ts b/translations/lrc_be.ts
index fd0f12bf4f0543fc8d54b7b94309185bd39f9f75..350345cece2cbfc87b8367711080547821985489 100644
--- a/translations/lrc_be.ts
+++ b/translations/lrc_be.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_be_BY.ts b/translations/lrc_be_BY.ts
index 991a0df2beedc0d9f7e9fd379b659eb815291563..f612b0fadf2b943f8c522a0d3f1454dcf129a372 100644
--- a/translations/lrc_be_BY.ts
+++ b/translations/lrc_be_BY.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_bg.ts b/translations/lrc_bg.ts
index 4354d605f2bd85308b77c9427f1278fabfac2545..2f08ceeca633dcc9b260761c2965c6672b79a8aa 100644
--- a/translations/lrc_bg.ts
+++ b/translations/lrc_bg.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation>Запазване на акаунта</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Премахване на разговора</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Потвърдете паролата</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>ПотребителÑкото име вече е заето</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>ИзнаÑÑне</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Премахване</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Отказ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Профилът Ви Ñе ÑÐ¿Ð¾Ð´ÐµÐ»Ñ Ñамо Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸Ñ‚Ðµ Ви</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_bg_BG.ts b/translations/lrc_bg_BG.ts
index 8cebd2f35908f45ad3b881b200510e2bf4e0bc72..b0e18487e32bb079f3050a2985a28453e4592b20 100644
--- a/translations/lrc_bg_BG.ts
+++ b/translations/lrc_bg_BG.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation>Запазване на акаунта</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Премахване на разговора</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Потвърдете паролата</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>ПотребителÑкото име вече е заето</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>ИзнаÑÑне</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Премахване</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Отказ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Профилът Ви Ñе ÑÐ¿Ð¾Ð´ÐµÐ»Ñ Ñамо Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸Ñ‚Ðµ Ви</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_bn.ts b/translations/lrc_bn.ts
index a7c5b85578551cb60907c957a65bab277a919ba5..9e2ba243c44951f33c7bf36ee6dce165578b6653 100644
--- a/translations/lrc_bn.ts
+++ b/translations/lrc_bn.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ca.ts b/translations/lrc_ca.ts
index f6c492f096c00e62c60088601849a1a99732e18b..b0734a1c4d565cc900aab38de2ec109bd3729207 100644
--- a/translations/lrc_ca.ts
+++ b/translations/lrc_ca.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fes còpia de seguretat del compte</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fes còpia de seguretat del compte</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Esborra conversa</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Confirmi contrasenya</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Nom d'usuari ja registrat.</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contactes blocats</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Exporta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Copiï'l i comparteixi'l amb els seus amics!</translation>
<source>Welcome to</source>
<translation>Benvingut a</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Copiï'l i comparteixi'l amb els seus amics!</translation>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Realment vol eliminar aquesta conversa?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Ignora</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>El vostre perfil només es comparteix amb els vostres contactes</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_cs_CZ.ts b/translations/lrc_cs_CZ.ts
index 5bd4fae742d00340509cbe4d9451f7481a1ce421..549559e996fc48d7ffdd9a7193888f747bde071d 100644
--- a/translations/lrc_cs_CZ.ts
+++ b/translations/lrc_cs_CZ.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,24 +757,144 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Zálohovat úÄet zde</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Zálohujte svůj úÄet!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Zálohovat úÄet</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Odstranit konverzaci</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Potvrdit heslo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Zvolte si heslo k Å¡ifrovánà úÄtu na tomto zaÅ™ÃzenÃ. MÄ›jte na vÄ›domÃ, že heslo nelze obnovit.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Volitelné</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Uživatelské jméno je již zabrané.</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>ZmÄ›nit souÄasné heslo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Zálohovat úÄet do souboru .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1582,16 +1647,6 @@ Zkuste to, prosÃm, pozdÄ›ji znovu.</translation>
<source>Banned contacts</source>
<translation>Zakázané kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Jste si jisti, že chcete smazat tento úÄet?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2047,11 +2102,6 @@ Přejete si nynà provést aktualizaci?</translation>
<source>Create your account from a backup</source>
<translation>VytvoÅ™it váš úÄet ze zálohy</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Archiv zÃskáte kliknutÃm na „Zálohovat úÄet“ v nastavenà úÄtu. Vytvořà se tÃm soubor .gz na vaÅ¡em zaÅ™ÃzenÃ.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2142,16 +2192,6 @@ Přejete si nynà provést aktualizaci?</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2212,11 +2252,6 @@ Přejete si nynà provést aktualizaci?</translation>
<source>Export</source>
<translation>Exportovat</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Zvolit si profilový obrázek</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2539,11 +2574,6 @@ ZkopÃrujte je a sdÃlejte je se svými přáteli!</translation>
<source>Welcome to</source>
<translation>VÃtejte v</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2735,26 +2765,11 @@ ZkopÃrujte je a sdÃlejte je se svými přáteli!</translation>
<source>Remove</source>
<translation>Odstranit</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Opravdu chcete odstranit tuto konverzaci?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2908,26 +2923,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>OdmÃtnout</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Váš profil je sdÃlen jen s vaÅ¡imi kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3645,118 +3645,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_da.ts b/translations/lrc_da.ts
index bb96b95c5162de0d10767341ae8590929a49eeb2..2a0171884a095bc58dea4a33549f860cf57ab6d6 100644
--- a/translations/lrc_da.ts
+++ b/translations/lrc_da.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Bekræft adgangskode</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Valgfri</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Brugernavn er allerede taget</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Blokerede kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Eksport</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Kopier og del det med dine venner!</translation>
<source>Welcome to</source>
<translation>Velkommen til </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Kopier og del det med dine venner!</translation>
<source>Remove</source>
<translation>Fjern</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Afvis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Din profil vil kun blive delt med dine kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_da_DK.ts b/translations/lrc_da_DK.ts
index 869528670712422b5c4ddef9d8204513669b3b6c..d09d34c1ff7cd464090374d28b6b647794ecd1be 100644
--- a/translations/lrc_da_DK.ts
+++ b/translations/lrc_da_DK.ts
@@ -158,6 +158,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,22 +759,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -964,11 +1089,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,21 +1392,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1307,20 +1427,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1336,26 +1442,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1441,11 +1527,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1471,27 +1552,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2047,11 +2102,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2142,16 +2192,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2212,11 +2252,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished">Fjern</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2907,26 +2922,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3644,118 +3644,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/lrc_de.ts b/translations/lrc_de.ts
index 8bdaa9ab57f336355f2d98031a7a700620ea0c5c..637734b7c6bcf11c87d76e32cc8e07717b2fad73 100644
--- a/translations/lrc_de.ts
+++ b/translations/lrc_de.ts
@@ -70,22 +70,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Beim Abrufen dieses Repositorys ist ein Fehler aufgetreten</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Der Unterhaltungsmodus wird nicht erkannt</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>Eine ungültige Nachricht wurde erkannt</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Nicht genügend Autorisierung zum Aktualisieren der Unterhaltungsinformationen</translation>
</message>
</context>
<context>
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami ist eine universelle Kommunikationsplattform mit Datenschutz als Grundlage, die sich auf ein kostenloses verteiltes Netzwerk für alle stützt.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,24 +758,144 @@ Jami wird jetzt beendet.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ihr Konto existiert nur auf diesem Gerät. Wenn Sie Ihr Gerät verlieren oder die Anwendung deinstallieren, wird Ihr Konto gelöscht und kann nicht wiederhergestellt werden. Sie können Ihr Konto jetzt oder später sichern.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Backup des Kontos hier</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Sichern Sie Ihr Konto!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Konto sichern</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -951,22 +1076,17 @@ Jami wird jetzt beendet.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Auf der Seite</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>An der Spitze</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Selbst ausblenden</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1014,6 +1134,16 @@ Jami wird jetzt beendet.</translation>
<source>Remove conversation</source>
<translation>Unterhaltung entfernen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1127,7 +1257,7 @@ Jami wird jetzt beendet.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Layout-Einstellungen</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami wird jetzt beendet.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Dies ist der Fehler vom Backend: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1261,21 +1391,11 @@ Jami wird jetzt beendet.</translation>
<source>Confirm password</source>
<translation>Passwort bestätigen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Wählen Sie ein Passwort, um Ihr Konto auf diesem Gerät zu verschlüsseln. Beachten Sie, dass das Passwort nicht wiederhergestellt werden kann.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Sie können einen Benutzernamen auswählen, der auf Jami leicht gefunden und erreicht werden kann.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ Jami wird jetzt beendet.</translation>
<source>Username already taken</source>
<translation>Dieser Benutzername ist bereits vergeben</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sind Sie sicher, dass Sie Jami ohne Benutzernamen beitreten möchten?
-Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zugewiesen.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- Maximal 32 Zeichen
-- Alphabetische Zeichen (A bis Z)
-- Numerische Zeichen (0 bis 9)
-- Sonderzeichen erlaubt: Bindestrich (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Encrypt</source>
<translation>Verschlüsseln</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Dieser Account wird lokal erstellt</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Es wird empfohlen, einen Benutzernamen zu wählen, dieser kann nicht geändert werden</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Das Verschlüsseln Ihres Kontos mit einem Passwort ist optional und kann nicht wiederhergestellt werden</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Das Bild und der Spitzname sind optional und können in den Einstellungen geändert werden</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Change current password</source>
<translation>Aktuelles Passwort ändern</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Konto in einer .gz-Datei sichern</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,28 +1551,11 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Customize profile</source>
<translation>Profil anpassen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Dieses Profil wird nur mit den Kontakten dieses Kontos geteilt.
-Das Profil kann jederzeit in den Kontoeinstellungen geändert werden.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Verschlüsseln Sie Ihr Konto mit einem Passwort</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Ein Jami-Konto wird nur auf diesem Gerät als Archiv registriert, das die Schlüssel Ihres Kontos enthält. Der Zugriff auf dieses Archiv kann durch ein Passwort geschützt werden.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Bitte beachten Sie, dass ein verlorenes Passwort nicht wiederhergestellt werden kann!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1588,16 +1648,6 @@ Bitte versuchen Sie es später erneut.</translation>
<source>Banned contacts</source>
<translation>Gesperrte Kontakte</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Möchten Sie dieses Konto wirklich löschen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Wenn Ihr Konto nicht gesichert oder zu einem anderen Gerät hinzugefügt wurde, gehen Ihr Konto und Ihr registrierter Name unwiderruflich verloren.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2053,11 +2103,6 @@ Möchten Sie jetzt updaten?</translation>
<source>Create your account from a backup</source>
<translation>Konto aus einem Backup erstellen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Sie können ein Archiv erstellen, indem Sie in den Kontoeinstellungen auf "Konto sichern" klicken. Dadurch wird eine .gz-Datei auf Ihrem Gerät erstellt.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2148,16 +2193,6 @@ Möchten Sie jetzt updaten?</translation>
<source>Choose the account to link</source>
<translation>Wählen Sie das zu verknüpfende Konto aus</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Wählen Sie „Anderes Gerät verknüpfen“</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Der PIN-Code ist 10 Minuten lang verfügbar.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2218,11 +2253,6 @@ Möchten Sie jetzt updaten?</translation>
<source>Export</source>
<translation>Export</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Ein Bild als Avatar auswählen</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2545,11 +2575,6 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation>
<source>Welcome to</source>
<translation>Willkommen bei</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Teilen Sie frei und privat mit Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2741,26 +2766,11 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Die Migration zur Schwarm-Technologie ermöglicht die Synchronisierung dieser Konversation auf mehreren Geräten und verbessert die Zuverlässigkeit. Der gespeicherte Unterhaltungsverlauf wird dabei gelöscht.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Konversation migrieren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wollen Sie wirklich diese Konversation löschen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Möchten Sie diese Unterhaltung wirklich blockieren?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2927,11 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Dismiss</source>
<translation>Verwerfen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Fügen Sie ein Bild und einen Spitznamen hinzu, um Ihr Profil zu vervollständigen</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Dieses Profil wird nur mit den Kontakten dieses Kontos geteilt</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Ihr Profil wird nur mit Ihren Kontakten geteilt</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Warum sollte ich mein Konto speichern?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3648,120 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>What does Jami mean?</source>
<translation>Was bedeutet Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Die Wahl des Namens Jami wurde vom Suaheli-Wort jamii inspiriert, was Gemeinschaft als Substantiv und zusammen als Adverb bedeutet.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Was ist der grüne Punkt neben meinem Account?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Ein roter Punkt bedeutet, dass Ihr Account vom Netzwerk getrennt ist, er wird grün, wenn es verbunden ist</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Warum sollte ich mein Konto sichern?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami ist verteilt und Ihr Konto wird nur auf Ihrem Gerät gespeichert. Wenn Sie Ihr Passwort oder Ihre Daten verlieren, können Sie diese nicht wiederherstellen</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Kann ich einen Konferenzanruf machen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>In einem Anruf können Sie auf „Teilnehmer hinzufügen“ klicken, um einen Kontakt zu einem Anruf hinzuzufügen</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Hat Jami Gruppenchats?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>In den Einstellungen können Sie die Unterstützung für Gruppen aktivieren (experimentell)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Was ist ein Jami-Account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Ein Jami-Konto ist ein asymmetrischer Verschlüsselungsschlüssel. Ihr Konto wird durch eine Jami-ID identifiziert, die ein Fingerabdruck Ihres öffentlichen Schlüssels ist.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Welche Informationen muss ich angeben, um ein Jami-Konto zu erstellen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Wenn Sie ein neues Jami-Konto erstellen, müssen Sie keine privaten Informationen wie E-Mail, Adresse oder Telefonnummer angeben.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Warum muss ich kein Passwort verwenden?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Bei Jami wird Ihr Konto in einem Ordner auf Ihrem Gerät gespeichert. Das Passwort wird nur zum Verschlüsseln Ihres Accounts verwendet, um Sie vor jemandem zu schützen, der physischen Zugriff auf Ihr Gerät hat.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Warum muss ich keinen Benutzernamen registrieren?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Die dauerhafteste und sicherste Kennung ist Ihre Jami-ID, aber da diese für manche Personen schwierig zu verwenden ist, haben Sie auch die Möglichkeit, einen Benutzernamen zu registrieren.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Wie kann ich mein Konto sichern?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>In den Kontoeinstellungen steht eine Schaltfläche zum Sichern Ihres Kontos zur Verfügung.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Warum muss ich kein Passwort verwenden?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Was passiert, wenn ich mein Konto lösche?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Warum muss ich keinen Benutzernamen registrieren?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Ihr Konto wird nur auf Ihren eigenen Geräten gespeichert. Wenn Sie Ihr Konto von jedem Gerät löschen, ist das Konto weg und Sie können es nicht wiederherstellen.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Die dauerhafteste und sicherste Kennung ist Ihre Jami-ID, aber da diese für manche Personen schwierig zu verwenden ist, haben Sie auch die Möglichkeit, einen Benutzernamen zu registrieren.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Kann ich mein Konto auf mehreren Geräten verwenden?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Wie kann ich mein Konto sichern?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Ja, Sie können Ihr Konto über die Einstellungen verknüpfen oder Ihr Backup auf einem anderen Gerät importieren.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Was passiert, wenn ich mein Konto lösche?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_de_DE.ts b/translations/lrc_de_DE.ts
index cb8aa876bc170f65ae2419136617c2dcf13036b3..d0831403194e8d9d303e124b4039c85ad3ee165f 100644
--- a/translations/lrc_de_DE.ts
+++ b/translations/lrc_de_DE.ts
@@ -70,22 +70,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Beim Abrufen dieses Repositorys ist ein Fehler aufgetreten</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Der Unterhaltungsmodus wird nicht erkannt</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>Eine ungültige Nachricht wurde erkannt</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Nicht genügend Autorisierung zum Aktualisieren der Unterhaltungsinformationen</translation>
</message>
</context>
<context>
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami ist eine universelle Kommunikationsplattform mit Datenschutz als Grundlage, die sich auf ein kostenloses verteiltes Netzwerk für alle stützt.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,24 +758,144 @@ Jami wird nun beendet.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ihr Konto existiert nur auf diesem Gerät. Wenn Sie Ihr Gerät verlieren oder die Anwendung deinstallieren, wird Ihr Konto gelöscht und kann nicht wiederhergestellt werden. Sie können Ihr Konto jetzt oder später sichern.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Konto hier sichern</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Erstellen Sie eine Sicherheitskopie Ihres Kontos!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Konto sichern</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -951,22 +1076,17 @@ Jami wird nun beendet.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Auf der Seite</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>An der Spitze</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Selbst ausblenden</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1014,6 +1134,16 @@ Jami wird nun beendet.</translation>
<source>Remove conversation</source>
<translation>Entferne Gespräch</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1127,7 +1257,7 @@ Jami wird nun beendet.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Layout-Einstellungen</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami wird nun beendet.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Dies ist der Fehler vom Backend: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1261,21 +1391,11 @@ Jami wird nun beendet.</translation>
<source>Confirm password</source>
<translation>Konto bestätigen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Wählen Sie ein sicheres Passwort um den Schlüssel für Ihre Anmeldedaten auf diesem Gerät sicher zu verschlüsseln. Beachten Sie, dass dieses Passwort nicht wiederhergestellt werden kann, wenn Sie es verlieren.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Nicht zwingend erforderlich</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Sie können einen Benutzernamen auswählen, der auf Jami leicht gefunden und erreicht werden kann.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ Jami wird nun beendet.</translation>
<source>Username already taken</source>
<translation>Benutzername bereits vergeben</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sind Sie sicher, dass Sie Jami ohne Benutzernamen beitreten möchten?
-Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zugewiesen.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- Maximal 32 Zeichen
-- Alphabetische Zeichen (A bis Z)
-- Numerische Zeichen (0 bis 9)
-- Sonderzeichen erlaubt: Bindestrich (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Encrypt</source>
<translation>Verschlüsseln</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Dieser Account wird lokal erstellt</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Es wird empfohlen, einen Benutzernamen zu wählen, dieser kann nicht geändert werden</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Das Verschlüsseln Ihres Kontos mit einem Passwort ist optional und kann nicht wiederhergestellt werden</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Das Bild und der Spitzname sind optional und können in den Einstellungen geändert werden</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Change current password</source>
<translation>Das aktuelle Passwort ändern</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Konto in .gz-Datei sichern</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,28 +1551,11 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Customize profile</source>
<translation>Profil anpassen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Dieses Profil wird nur mit den Kontakten dieses Kontos geteilt.
-Das Profil kann jederzeit in den Kontoeinstellungen geändert werden.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Verschlüsseln Sie Ihr Konto mit einem Passwort</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Ein Jami-Konto wird nur auf diesem Gerät als Archiv registriert, das die Schlüssel Ihres Kontos enthält. Der Zugriff auf dieses Archiv kann durch ein Passwort geschützt werden.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Bitte beachten Sie, dass ein verlorenes Passwort nicht wiederhergestellt werden kann!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1588,16 +1648,6 @@ Versuchen Sie es später erneut.</translation>
<source>Banned contacts</source>
<translation>Blockierte Kontakte</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Wollen Sie dieses Konto wirklich löschen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Wenn Ihr Konto nicht gesichert oder zu einem anderen Gerät hinzugefügt wurde, gehen Ihr Konto und Ihr registrierter Name unwiderruflich verloren.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2053,11 +2103,6 @@ Möchten Sie jetzt aktualisieren? </translation>
<source>Create your account from a backup</source>
<translation>Konto aus Backup erstellen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Sie können ein Archiv erstellen, indem Sie in den Kontoeinstellungen "Konto sichern" auswählen. So erstellen Sie eine .gz-Datei auf Ihrem Gerät.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2148,16 +2193,6 @@ Möchten Sie jetzt aktualisieren? </translation>
<source>Choose the account to link</source>
<translation>Wählen Sie das zu verknüpfende Konto aus</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Wählen Sie „Anderes Gerät verknüpfen“</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Der PIN-Code ist 10 Minuten lang verfügbar.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2218,11 +2253,6 @@ Möchten Sie jetzt aktualisieren? </translation>
<source>Export</source>
<translation>Exportieren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Wählen Sie ein Bild als Avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2545,11 +2575,6 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation>
<source>Welcome to</source>
<translation>Willkommen bei </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Teilen Sie frei und privat mit Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2741,26 +2766,11 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Die Migration zur Schwarm-Technologie ermöglicht die Synchronisierung dieser Konversation auf mehreren Geräten und verbessert die Zuverlässigkeit. Der gespeicherte Unterhaltungsverlauf wird dabei gelöscht.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Konversation migrieren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wollen Sie diese Unterhaltung wirklich löschen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Möchten Sie diese Unterhaltung wirklich blockieren?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2927,11 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Dismiss</source>
<translation>Abweisen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Fügen Sie ein Bild und einen Spitznamen hinzu, um Ihr Profil zu vervollständigen</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Dieses Profil wird nur mit den Kontakten dieses Kontos geteilt</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Dein Profil wird nur mit deinen Kontakten geteilt</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Warum sollte ich mein Konto speichern?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3648,120 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>What does Jami mean?</source>
<translation>Was bedeutet Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Die Wahl des Namens Jami wurde vom Suaheli-Wort jamii inspiriert, was Gemeinschaft als Substantiv und zusammen als Adverb bedeutet.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Was ist der grüne Punkt neben meinem Account?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Ein roter Punkt bedeutet, dass Ihr Account vom Netzwerk getrennt ist, er wird grün, wenn es verbunden ist</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Warum sollte ich mein Konto sichern?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami ist verteilt und Ihr Konto wird nur auf Ihrem Gerät gespeichert. Wenn Sie Ihr Passwort oder Ihre Daten verlieren, können Sie diese nicht wiederherstellen</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Kann ich einen Konferenzanruf machen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>In einem Anruf können Sie auf „Teilnehmer hinzufügen“ klicken, um einen Kontakt zu einem Anruf hinzuzufügen</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Hat Jami Gruppenchats?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>In den Einstellungen können Sie die Unterstützung für Gruppen aktivieren (experimentell)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Was ist ein Jami-Account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Ein Jami-Konto ist ein asymmetrischer Verschlüsselungsschlüssel. Ihr Konto wird durch eine Jami-ID identifiziert, die ein Fingerabdruck Ihres öffentlichen Schlüssels ist.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Welche Informationen muss ich angeben, um ein Jami-Konto zu erstellen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Wenn Sie ein neues Jami-Konto erstellen, müssen Sie keine privaten Informationen wie E-Mail, Adresse oder Telefonnummer angeben.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Warum muss ich kein Passwort verwenden?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Bei Jami wird Ihr Konto in einem Ordner auf Ihrem Gerät gespeichert. Das Passwort wird nur zum Verschlüsseln Ihres Accounts verwendet, um Sie vor jemandem zu schützen, der physischen Zugriff auf Ihr Gerät hat.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Warum muss ich keinen Benutzernamen registrieren?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Die dauerhafteste und sicherste Kennung ist Ihre Jami-ID, aber da diese für manche Personen schwierig zu verwenden ist, haben Sie auch die Möglichkeit, einen Benutzernamen zu registrieren.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Wie kann ich mein Konto sichern?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>In den Kontoeinstellungen steht eine Schaltfläche zum Sichern Ihres Kontos zur Verfügung.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Warum muss ich kein Passwort verwenden?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Was passiert, wenn ich mein Konto lösche?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Warum muss ich keinen Benutzernamen registrieren?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Ihr Konto wird nur auf Ihren eigenen Geräten gespeichert. Wenn Sie Ihr Konto von jedem Gerät löschen, ist das Konto weg und Sie können es nicht wiederherstellen.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Die dauerhafteste und sicherste Kennung ist Ihre Jami-ID, aber da diese für manche Personen schwierig zu verwenden ist, haben Sie auch die Möglichkeit, einen Benutzernamen zu registrieren.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Kann ich mein Konto auf mehreren Geräten verwenden?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Wie kann ich mein Konto sichern?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Ja, Sie können Ihr Konto über die Einstellungen verknüpfen oder Ihr Backup auf einem anderen Gerät importieren.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Was passiert, wenn ich mein Konto lösche?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_el.ts b/translations/lrc_el.ts
index a6f2d14ab73897100c413f99b34cc06e0442f306..451a2d924859d78fa84bef39f43f69c2d3febfcc 100644
--- a/translations/lrc_el.ts
+++ b/translations/lrc_el.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Î ÏοεÏαιτικό</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Το όνομα χÏήστη ήδη χÏησιμοποιείται</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Εξαγωγή</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>ΑπόÏÏιψη</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Το Ï€Ïοφίλ σας διαμοιÏάζεται μόνο με τις επαφÎÏ‚ σας</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_en.ts b/translations/lrc_en.ts
index 2ebf884b9dcfb4221a5b0348769c2da5f46456cd..4792197c661c20bc2983acb8e0f5c8018dc34d66 100644
--- a/translations/lrc_en.ts
+++ b/translations/lrc_en.ts
@@ -158,6 +158,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,22 +759,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -964,11 +1089,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,21 +1392,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1307,20 +1427,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1336,26 +1442,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1441,11 +1527,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1471,27 +1552,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2047,11 +2102,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2142,16 +2192,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2212,11 +2252,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2907,26 +2922,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3644,118 +3644,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/lrc_en_GB.ts b/translations/lrc_en_GB.ts
index 50a797f0e54d1cc1206a6230dda98e3caf72bbcb..20a57836bc9aacd13e6e037cd8cced802feb3bcf 100644
--- a/translations/lrc_en_GB.ts
+++ b/translations/lrc_en_GB.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_en_IE.ts b/translations/lrc_en_IE.ts
index 964725aa353cd2cde58e01e69bbb5931ad181d83..b8e2ffdecc689feb16e1f1d6d9413baaadc4c50f 100644
--- a/translations/lrc_en_IE.ts
+++ b/translations/lrc_en_IE.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_eo.ts b/translations/lrc_eo.ts
index 196d68da0cbc4d2e8e6abb8f87cb9288bcda2a0a..426cf2e23fc4e36e81502cc93e21846f460abc45 100644
--- a/translations/lrc_eo.ts
+++ b/translations/lrc_eo.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Konfirmu pasvorton</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Uzantnomo jam prenita</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Elporti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Forigi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_es.ts b/translations/lrc_es.ts
index e578009490138a4be14e5f913e1810875ae3360f..30043321695d89440244bff9df233e4852463169 100644
--- a/translations/lrc_es.ts
+++ b/translations/lrc_es.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami se cerrará.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Esta cuenta sólo existe en este dispositivo. Si lo pierdes o desinstalas la aplicación, tu cuenta se borrará y no se podrá recuperar. Puedes crear un archivo de respaldo de tu cuenta ahora o más adelante.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Crear archivo de respaldo aquÃ</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>¡Crea un archivo de respaldo para tu cuenta!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Cuenta de respaldo</translation>
+ <source>Back up account</source>
+ <translation>Respaldar cuenta</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami se cerrará.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami se cerrará.</translation>
<source>Remove conversation</source>
<translation>Eliminar conversación</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami se cerrará.</translation>
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Elija una contraseña para encriptar tu cuenta en este dispositivo. Tenga en cuenta que la contraseña no podrá ser recuperada</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami se cerrará.</translation>
<source>Username already taken</source>
<translation>El nombre de usuario ya está en uso</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Cambiar contraseña actual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Crear archivo (.gz) de respaldo</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Por favor inténtalo más tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos bloqueados</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>¿Realmente deseas eliminar esta cuenta?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si no has creado un archivo de respaldo ni has vinculado tu cuenta a otro dispositivo, tu cuenta y nombre de usuario se perderán irrevocablemente.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Por favor inténtalo más tarde.</translation>
<source>Create your account from a backup</source>
<translation>Crear una cuenta desde un archivo de respaldo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Puedes obtener un archivo haciendo click en "Crear respaldo de la cuenta" dentro de configuración de la cuenta. Esto creará un archivo .gz en tu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Por favor inténtalo más tarde.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Por favor inténtalo más tarde.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Elige una imagen de avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Bienvenido a</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>¿Desea eliminar esta conversación?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ se conecte para sincronizar la conversación.</translation>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Tu perfil solamente se comparte con tus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ se conecte para sincronizar la conversación.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_es_AR.ts b/translations/lrc_es_AR.ts
index d86447c70e7fc67aee2de9a81bcfe008fe4608f6..cfd6d7433aeec37093470cd75575b9b9b212c21f 100644
--- a/translations/lrc_es_AR.ts
+++ b/translations/lrc_es_AR.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami se cerrará.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Esta cuenta sólo existe en este dispositivo. Si lo perdés o desinstalás la aplicación, tu cuenta se borrará y no se podrá recuperar. Podés crear un archivo de respaldo de tu cuenta ahora o más adelante.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Respaldar cuenta aquÃ</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>¡Crear copia de respaldo de tu cuenta!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Crear respaldo de la cuenta</translation>
+ <source>Back up account</source>
+ <translation>Respaldar cuenta</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami se cerrará.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami se cerrará.</translation>
<source>Remove conversation</source>
<translation>Eliminar conversación</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami se cerrará.</translation>
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Elegà una contraseña para encriptar tu cuenta en este dispositivo. Tené en cuenta que la contraseña no podrá ser recuperada</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami se cerrará.</translation>
<source>Username already taken</source>
<translation>Nombre de usuario ya en uso</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Cambiar contraseña actual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Respaldar tu cuenta en un archivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Por favor intentalo más tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos prohibidos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>¿Realmente querés eliminar esta cuenta?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si no has creado un archivo de respaldo ni has vinculado tu cuenta a otro dispositivo, tu cuenta y nombre de usuario se perderán irrevocablemente.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Por favor intentalo más tarde.</translation>
<source>Create your account from a backup</source>
<translation>Crear una cuenta desde un archivo de respaldo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Podés obtener un archivo de respaldo haciendo click en "Crear respaldo de la cuenta" dentro de configuración de la cuenta. Esto creará un archivo .gz en tu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Por favor intentalo más tarde.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Por favor intentalo más tarde.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Elegir una imagen de avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Bienvenido a</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>¿Realmente quieres eliminar esta conversación?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ se conecte para sincronizar la conversación.</translation>
<source>Dismiss</source>
<translation>Rechazar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Tu perfil sólo es compartido con tus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ se conecte para sincronizar la conversación.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_es_CO.ts b/translations/lrc_es_CO.ts
index 34aeeb37f306eb5808e50337d8920a72258040d3..7116007036c9b5afb30e87319d967ab304afd602 100644
--- a/translations/lrc_es_CO.ts
+++ b/translations/lrc_es_CO.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami se cerrará.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Esta cuenta sólo existe en este dispositivo. Si lo perdés o desinstalás la aplicación, tu cuenta se borrará y no se podrá recuperar. Podés crear un archivo de respaldo de tu cuenta ahora o más adelante.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Respaldar cuenta aquÃ</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>¡Respalde su cuenta!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Crear respaldo de la cuenta</translation>
+ <source>Back up account</source>
+ <translation>Respaldar cuenta</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami se cerrará.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami se cerrará.</translation>
<source>Remove conversation</source>
<translation>Eliminar conversación</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami se cerrará.</translation>
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Elija una contraseña para encriptar tu cuenta en este dispositivo. Tenga en cuenta que la contraseña no podrá ser recuperada</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami se cerrará.</translation>
<source>Username already taken</source>
<translation>El nombre de usuario ya está ocupado</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Cambiar contraseña actual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Respaldar tu cuenta en un archivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Por favor intentalo más tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos bloqueados</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>¿Realmente querés eliminar esta cuenta?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si no has creado un archivo de respaldo ni has vinculado tu cuenta a otro dispositivo, tu cuenta y nombre de usuario se perderán irrevocablemente.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Por favor intentalo más tarde.</translation>
<source>Create your account from a backup</source>
<translation>Crear una cuenta desde un archivo de respaldo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Puede crear un archivo pulsando «Respaldar cuenta» en la configuración de la cuenta. Esto creará un archivo .gz en su dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Por favor intentalo más tarde.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Por favor intentalo más tarde.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Elegà una imagen de avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Le damos la bienvenida a</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>¿Realmente quiere eliminar esta conversación?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ se conecte para sincronizar la conversación.</translation>
<source>Dismiss</source>
<translation>Rechazar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Tu perfil sólo es compartido con tus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ se conecte para sincronizar la conversación.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_es_MX.ts b/translations/lrc_es_MX.ts
index 2d863d68e47915bd30909bdc9a9b1c3d27f3a13e..894cb5722a422b8b3e1a23706c52cc45dbcce3e2 100644
--- a/translations/lrc_es_MX.ts
+++ b/translations/lrc_es_MX.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami se cerrará.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Esta cuenta sólo existe en este dispositivo. Si lo perdés o desinstalás la aplicación, tu cuenta se borrará y no se podrá recuperar. Podés crear un archivo de respaldo de tu cuenta ahora o más adelante.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Respaldar cuenta aquÃ</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>¡Crear copia de respaldo de tu cuenta!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Crear respaldo de la cuenta</translation>
+ <source>Back up account</source>
+ <translation>Respaldar cuenta</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami se cerrará.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami se cerrará.</translation>
<source>Remove conversation</source>
<translation>Eliminar conversación</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami se cerrará.</translation>
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Elija una contraseña para encriptar tu cuenta en este dispositivo. Tenga en cuenta que la contraseña no podrá ser recuperada</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami se cerrará.</translation>
<source>Username already taken</source>
<translation>El nombre de usuario ya está en uso</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Cambiar contraseña actual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Respaldar tu cuenta en un archivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Por favor intentalo más tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos bloqueados</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>¿Realmente querés eliminar esta cuenta?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si no has creado un archivo de respaldo ni has vinculado tu cuenta a otro dispositivo, tu cuenta y nombre de usuario se perderán irrevocablemente.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Por favor intentalo más tarde.</translation>
<source>Create your account from a backup</source>
<translation>Crear una cuenta desde un archivo de respaldo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Puedes obtener un archivo haciendo click en "Crear respaldo de la cuenta" dentro de configuración de la cuenta. Esto creará un archivo .gz en tu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Por favor intentalo más tarde.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Por favor intentalo más tarde.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Elegà una imagen de avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Le damos la bienvenida a</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>¿Realmente quiere eliminar esta conversación?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ se conecte para sincronizar la conversación.</translation>
<source>Dismiss</source>
<translation>Rechazar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Tu perfil sólo es compartido con tus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ se conecte para sincronizar la conversación.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_et.ts b/translations/lrc_et.ts
index 67c782291457bf719cabbde7e83f8479a2434f3a..c2d2b66025b45f3b3cb1b34c5c3054e5de5e5e23 100644
--- a/translations/lrc_et.ts
+++ b/translations/lrc_et.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Kustuta vestlus</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_et_EE.ts b/translations/lrc_et_EE.ts
index f71835e000ad840534529d1be2b1c1e703a3aaf0..4a888c861363cc660d9e41363bb423061f4616af 100644
--- a/translations/lrc_et_EE.ts
+++ b/translations/lrc_et_EE.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Kustuta vestlus</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_eu.ts b/translations/lrc_eu.ts
index 08598d9498f4a8063bc9294d3b762f25f0959512..69d5e83cd6c526c9eed9a6bf701238e3fff2a9a5 100644
--- a/translations/lrc_eu.ts
+++ b/translations/lrc_eu.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Egin kontuaren babes-kopia</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Elkarrizketa ezabatu</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Berretsi pasahitza</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Baztertu</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Zure profila zure kontaktuekin partekatzen da soilik</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_fa.ts b/translations/lrc_fa.ts
index 5904c354249205cc35ef957d85aea09dbbcaa28f..b0e6e30f80efd1ca83860a70062dc72862789c90 100644
--- a/translations/lrc_fa.ts
+++ b/translations/lrc_fa.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>پشتیبان‌گیری از Øساب شما</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>پشتیبان‌گیری Øساب</translation>
+ <source>Back up account</source>
+ <translation>پشتیبان گیری از Øساب</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>ØØ°Ù Ú¯Ùتگو</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>تأیید گذرواژه</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>اختیاری</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>نام کاربری قبلا گرÙته شده است</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1582,16 +1647,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>مخاطبان مسدود شده</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2046,11 +2101,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>می‌توانید با کلیک روی "پشتیبان‌گیری Øساب" در تنظیمات Øساب،یک بایگانی تهیه کنید. این کار یک پرونده ‎.gz را در دستگاه شما ایجاد می‌کند.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2141,16 +2191,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2211,11 +2251,6 @@ Please try again later.</source>
<source>Export</source>
<translation>برون‌ریزی</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>خوش آمدید به</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>ØØ°Ù Ú©Ù†</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>آیا به Øذ٠این Ú¯Ùتگو مطمئن هستید؟</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2908,26 +2923,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation> رد‌کردن</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>نمایه شما تنها با مخاطبانتان هم‌رسانی می‌شود</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3645,118 +3645,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_fa_IR.ts b/translations/lrc_fa_IR.ts
index 5ae512f7769a4edcbb6e5b51244626b8f78cdc7f..e96e3cf9d85d39ba036bb17419826aa4cb66d15e 100644
--- a/translations/lrc_fa_IR.ts
+++ b/translations/lrc_fa_IR.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>پشتیبان‌گیری از Øساب شما</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>پشتیبان‌گیری Øساب</translation>
+ <source>Back up account</source>
+ <translation>پشتیبان گیری از Øساب</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>ØØ°Ù Ú¯Ùتگو</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>تأیید گذرواژه</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>اختیاری</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>نام کاربری قبلا گرÙته شده است</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1582,16 +1647,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>مخاطبان مسدود شده</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2046,11 +2101,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>می‌توانید با کلیک روی "پشتیبان‌گیری Øساب" در تنظیمات Øساب،یک بایگانی تهیه کنید. این کار یک پرونده ‎.gz را در دستگاه شما ایجاد می‌کند.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2141,16 +2191,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2211,11 +2251,6 @@ Please try again later.</source>
<source>Export</source>
<translation>برون‌ریزی</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>خوش آمدید به</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>ØØ°Ù Ú©Ù†</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>آیا به Øذ٠این Ú¯Ùتگو مطمئن هستید؟</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2908,26 +2923,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation> رد‌کردن</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>نمایه شما تنها با مخاطبانتان هم‌رسانی می‌شود</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3645,118 +3645,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_fi.ts b/translations/lrc_fi.ts
index ce7f20e8c3643141049d4745824405c76e969309..60cd3c4db3d7722147300600ba3403eb11d036db 100644
--- a/translations/lrc_fi.ts
+++ b/translations/lrc_fi.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami sulkeutuu nyt.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Sinun tunnus on olemassa vain tällä laitteella. Jos kadotat laitteen tai poistat sovelluksen asennuksen, tunnus poistetaan eikä sitä voi palauttaa. Voit varmuuskopioida tunnuksen nyt tai myöhemmin.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Varmuuskopioi tunnus täällä</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Varmuuskopioi tunnuksesi!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Varmuuskopioi tunnus</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami sulkeutuu nyt.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami sulkeutuu nyt.</translation>
<source>Remove conversation</source>
<translation>Poista keskustelu</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami sulkeutuu nyt.</translation>
<source>Confirm password</source>
<translation>Varmista salasana</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Valitse salasana, joka salaa tunnuksen tällä laitteella. Huomaa, että salasanaa ei voi palauttaa.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Valinnainen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami sulkeutuu nyt.</translation>
<source>Username already taken</source>
<translation>käyttäjätunnus on varattu</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Vaihda nykyinen salasana</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Varmuuskopioi tunnus .gz-tiedostoon</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Yritä myöhemmin uudelleen.</translation>
<source>Banned contacts</source>
<translation>Estetyt yhteystiedot</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Haluatko varmasti poistaa tämän tunnuksen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Jos sinun tunnusta ei ole varmuuskopioitu tai lisätty toiseen laitteeseen, tunnus ja rekisteröity nimi menetetään lopullisesti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Haluatko päivittää nyt?</translation>
<source>Create your account from a backup</source>
<translation>Luo tunnus varmuuskopiosta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Voit tehdä pakatun varmistuksen napsauttamalla "Varmuuskopioi tunnus" Tunnuksen asetuksissa. Tämä luo gz-tiedoston laitteellesi.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Haluatko päivittää nyt?</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Haluatko päivittää nyt?</translation>
<source>Export</source>
<translation>Vie</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Valitse hahmosi kuva</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<source>Welcome to</source>
<translation>Tervetuloa</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<source>Remove</source>
<translation>Poista</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Haluatko todella poistaa tämän keskustelun?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>Dismiss</source>
<translation>Hylkää</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profiilisi jaetaan vain sinun yhteystietojen kanssa</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ tahdistaa yhteyden keskusteluun.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_fr.ts b/translations/lrc_fr.ts
index d5f28a2d3a71e7f3a1a3a1f718431e85086dca69..230631fa18852cc21931f130a5ef6d8c6f14e1e1 100644
--- a/translations/lrc_fr.ts
+++ b/translations/lrc_fr.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,23 +759,143 @@ Veuillez entrer votre mot de passe.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account</source>
+ <translation>Sauvegarder un compte</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -964,11 +1089,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Veuillez entrer votre mot de passe.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,22 +1392,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1308,24 +1427,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur déjà utilisé</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1341,26 +1442,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1446,11 +1527,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1476,28 +1552,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1590,16 +1649,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2055,11 +2104,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2150,16 +2194,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2220,11 +2254,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Export</source>
<translation>Exporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2546,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Bienvenue sur</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2742,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Enlever</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migrer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2926,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Rejeter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil n'est partagé qu'avec vos contacts</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3647,120 @@ connects to synchronize the conversation.</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_fr_BE.ts b/translations/lrc_fr_BE.ts
index 2519d6a63f61bc3a9aa8e969c864686d1fa87e24..8462f630f4a10510a5daa08a1f1f4c0f375f0b22 100644
--- a/translations/lrc_fr_BE.ts
+++ b/translations/lrc_fr_BE.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,23 +759,143 @@ Veuillez entrer votre mot de passe.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account</source>
+ <translation>Sauvegarder un compte</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -964,11 +1089,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Veuillez entrer votre mot de passe.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,22 +1392,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1308,24 +1427,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur non-disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1341,26 +1442,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1446,11 +1527,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1476,28 +1552,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1590,16 +1649,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2055,11 +2104,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2150,16 +2194,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2220,11 +2254,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Export</source>
<translation>Exporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2546,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Bienvenue sur</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2742,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Supprimer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migrer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2926,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil n'est partagé qu'avec vos contacts</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3647,120 @@ connects to synchronize the conversation.</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_fr_CA.ts b/translations/lrc_fr_CA.ts
index 0d5949b42d99572f47d2e01d2dc6455878915f1a..b07479e22ba1bd4198a1cb9c77467df2d60444df 100644
--- a/translations/lrc_fr_CA.ts
+++ b/translations/lrc_fr_CA.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,23 +759,143 @@ Veuillez entrer votre mot de passe.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account</source>
+ <translation>Sauvegarder un compte</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -964,11 +1089,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Veuillez entrer votre mot de passe.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,22 +1392,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1308,24 +1427,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur non-disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1341,26 +1442,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1446,11 +1527,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1476,28 +1552,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1590,16 +1649,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2055,11 +2104,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2150,16 +2194,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2220,11 +2254,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Export</source>
<translation>Exportation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2546,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Bienvenue sur</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2742,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Supprimer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migrer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2926,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil est partagé avec vos contacts uniquement</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3647,120 @@ connects to synchronize the conversation.</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_fr_CH.ts b/translations/lrc_fr_CH.ts
index 2a7ccf8b73d567f22c669644e0b948203f1cc292..d5e698dd1d31fbff649ec9df382b2b3da3b4198c 100644
--- a/translations/lrc_fr_CH.ts
+++ b/translations/lrc_fr_CH.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,23 +759,143 @@ Veuillez entrer votre mot de passe.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account</source>
+ <translation>Sauvegarder un compte</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -964,11 +1089,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Veuillez entrer votre mot de passe.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,22 +1392,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1308,24 +1427,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur non-disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1341,26 +1442,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1446,11 +1527,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1476,28 +1552,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1590,16 +1649,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2055,11 +2104,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2150,16 +2194,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2220,11 +2254,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Export</source>
<translation>Exporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2546,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Bienvenue sur</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2742,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Supprimer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migrer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2926,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil n'est partagé qu'avec vos contacts</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3647,120 @@ connects to synchronize the conversation.</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_fr_FR.ts b/translations/lrc_fr_FR.ts
index 9422a643c825434eb994966f814088641506e88b..cfe842b94030538dbb4bf238039d31b7fa897635 100644
--- a/translations/lrc_fr_FR.ts
+++ b/translations/lrc_fr_FR.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,23 +759,143 @@ Veuillez entrer votre mot de passe.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <source>Back up account</source>
+ <translation>Sauvegarder un compte</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -964,11 +1089,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Veuillez entrer votre mot de passe.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,22 +1392,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1308,24 +1427,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur non-disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1341,26 +1442,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1446,11 +1527,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1476,28 +1552,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1590,16 +1649,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2055,11 +2104,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2150,16 +2194,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2220,11 +2254,6 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Export</source>
<translation>Exporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2546,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Bienvenue sur</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2742,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Supprimer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migrer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2926,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil n'est partagé qu'avec vos contacts</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3647,120 @@ connects to synchronize the conversation.</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_ga.ts b/translations/lrc_ga.ts
index 65a66881d33616683f655cca3a0fd92266ea4092..a0a6b95bddc4844d4ce0512143ca62456e405bec 100644
--- a/translations/lrc_ga.ts
+++ b/translations/lrc_ga.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_gl.ts b/translations/lrc_gl.ts
index 4bd7d9584fd63ccdbada01cd294be68c440a8d18..c69822750c81d6d07331bd570d5217959d118ce3 100644
--- a/translations/lrc_gl.ts
+++ b/translations/lrc_gl.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami vai pechar.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fai copia de apoio para a conta</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Copia de apoio da conta</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami vai pechar.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami vai pechar.</translation>
<source>Remove conversation</source>
<translation>Eliminar conversa</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami vai pechar.</translation>
<source>Confirm password</source>
<translation>Confirmar contrasinal</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami vai pechar.</translation>
<source>Username already taken</source>
<translation>Este nome de usuaria xa está collido</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1582,16 +1647,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contactos excluÃdos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2046,11 +2101,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Podes obter un ficheiro premendo en "Copia de Apoio da conta" nos axustes da conta. Esto creará un ficheiro .gz no teu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2141,16 +2191,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2211,11 +2251,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Copiao e compárteo coas túas amizades!</translation>
<source>Welcome to</source>
<translation>Benvido/a a</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Copiao e compárteo coas túas amizades!</translation>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Tes a certeza de que queres eliminar esta conversa?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2907,26 +2922,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Desbotar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>O teu perfil só se comparte cos teus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3644,118 +3644,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_gu.ts b/translations/lrc_gu.ts
index 7c99e4de85c29af02d1a12790c5e156a7a754bf0..54083b0cc8b4e84296067d955d5c9023da267a25 100644
--- a/translations/lrc_gu.ts
+++ b/translations/lrc_gu.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_he.ts b/translations/lrc_he.ts
index a689b740ce3a457a1a8c5db7730fa221c861610a..e3341364af10277eae857b6f7d530234bd9e9484 100644
--- a/translations/lrc_he.ts
+++ b/translations/lrc_he.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>ברוך בו×ך ×ל</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>הסר</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_hi.ts b/translations/lrc_hi.ts
index b9ce2a8aa64b76812c9eac221644b4ecbffc30ee..351407a54e13eb6dc340b3d739bb6a545de18f37 100644
--- a/translations/lrc_hi.ts
+++ b/translations/lrc_hi.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>आपका सà¥à¤µà¤¾à¤—त है</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>खारिज करे </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_hi_IN.ts b/translations/lrc_hi_IN.ts
index f05fb5fffa3acfba586a272448484ace97d6aa18..82c438096a8327ce4e7226e01abf2d124f15c935 100644
--- a/translations/lrc_hi_IN.ts
+++ b/translations/lrc_hi_IN.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>आपका सà¥à¤µà¤¾à¤—त है</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>खारिज करे </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_hr.ts b/translations/lrc_hr.ts
index 0f3cd8bf89b83b69bab2a1af95986ce6eda81fa9..cb2629a6f6d00b02d1da8794b071050726b8910d 100644
--- a/translations/lrc_hr.ts
+++ b/translations/lrc_hr.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Potvrdi lozinku</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Izvezi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Ukloni</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Vaš profil je podjeljen samo sa vašim kontaktima</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_hu.ts b/translations/lrc_hu.ts
index 634e4399db8bea1e37859307277607e21140c75e..4bbee3e33fc085c7e32250eaa22bd501529f4adc 100644
--- a/translations/lrc_hu.ts
+++ b/translations/lrc_hu.ts
@@ -70,22 +70,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Hiba történt az adattár lekérése közben</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Felismeretlen beszélgetési mód</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>Érvénytelen üzenet észlelve</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Nincs jogosultság a beszélgetési adatok frissÃtésére</translation>
</message>
</context>
<context>
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami egy univerzális kommunikációs platform, amelynek alapja a magánélet védelme, amely mindenki számára ingyenes elosztott hálózatra támaszkodik.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ A Jami most kilép.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ez a fiók csak ezen az eszközön létezik. Ha elveszÃti eszközét, vagy eltávolÃtotta az alkalmazást, akkor fiókját töröljük. Biztonsági másolatot készÃthet fiókjáról most vagy késÅ‘bb.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fiók biztonsági mentése</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Biztonsági másolat készÃtése a fiókjáról</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fiók biztonsági mentése</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -951,22 +1076,17 @@ A Jami most kilép.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Oldalán</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>Felül</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Önrejtés</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1014,6 +1134,16 @@ A Jami most kilép.</translation>
<source>Remove conversation</source>
<translation>Beszélgetés törlése</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1127,7 +1257,7 @@ A Jami most kilép.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Elrendezési beállÃtások</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ A Jami most kilép.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Háttérszolgáltatás-hiba: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1261,21 +1391,11 @@ A Jami most kilép.</translation>
<source>Confirm password</source>
<translation>Jelszó megerÅ‘sÃtése</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Válasszon egy jelszót az eszköz fiókkulcsának titkosÃtásához. Vegye figyelembe, hogy a jelszó nem lehet helyreállÃtott.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Választható</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Kiválaszthat egy felhasználónevet, hogy könnyen megtalálható és elérhető legyen a Jamin.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ A Jami most kilép.</translation>
<source>Username already taken</source>
<translation>A felhasználónév már foglalt</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Biztos benne, hogy felhasználónév nélkül szeretne csatlakozni Jami-hez?
-Ha igen, akkor csak egy véletlenszerűen generált 40 karakterű azonosÃtó kerül hozzárendelve ehhez a fiókhoz.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- Legfeljebb 32 karakter
-- Betű karakterek (A-tól Z-ig)
-- Numerikus karakterek (0–9)
-- Különleges karakter: kötőjel (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ Ha igen, akkor csak egy véletlenszerűen generált 40 karakterű azonosÃtó ke
<source>Encrypt</source>
<translation>TitkosÃtás</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Helyileg létrehozott fiók</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Válasszon felhasználónevet (nem kötelezÅ‘, de ajánlott). Felhasználónév nem módosÃtható.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Fiók titkosÃtása jelszóval (nem kötelezÅ‘). A jelszó nem állÃtható vissza.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>A kép és a becenév nem kötelezÅ‘, és a beállÃtásokban módosÃtható</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ Ha igen, akkor csak egy véletlenszerűen generált 40 karakterű azonosÃtó ke
<source>Change current password</source>
<translation>Jelszó megváltoztatása</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Biztonsági másolat készÃtése .gz fájlba</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,28 +1551,11 @@ Ha igen, akkor csak egy véletlenszerűen generált 40 karakterű azonosÃtó ke
<source>Customize profile</source>
<translation>Profil testreszabása</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ez a profil csak a fiók kapcsolattartóival van megosztva.
-A profil bármikor módosÃtható a FiókbeállÃtásokban.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Fiók titkosÃtása jelszóval</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>A Jami-fiók csak a fiók kulcsait tartalmazó archÃvumként van regisztrálva ezen az eszközön. Az archÃvumhoz való hozzáférés jelszóval védhetÅ‘.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Megjegyzés: Ha a jelszó elveszett, a fiókot nem lehet visszaállÃtani!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1588,16 +1648,6 @@ Kérjük, hogy próbálja újra később.</translation>
<source>Banned contacts</source>
<translation>Letiltott kapcsolatok</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Biztosan törli a kiválasztott fiókot?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Ha fiókjáról nem készÃtett biztonsági másolatot, vagy nem adott hozzá egy másik eszközhöz, akkor fiókját és regisztrált nevét visszavonhatatlanul elveszÃti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2052,11 +2102,6 @@ Kérjük, hogy próbálja újra később.</translation>
<source>Create your account from a backup</source>
<translation>Fiók létrehozása biztonsági másolatból</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Ha archÃvumot szeretne kapni, kattintson a fiókbeállÃtások „Fiók biztonsági mentése†elemére. Ez létrehoz egy .gz fájlt az eszközén.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2147,16 +2192,6 @@ Kérjük, hogy próbálja újra később.</translation>
<source>Choose the account to link</source>
<translation>Fiók kiválasztása az összekapcsoláshoz</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Válassza az „Eszköz összekapcsolása fiókhozâ€</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>A PIN-kód 10 percig érvényes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2217,11 +2252,6 @@ Kérjük, hogy próbálja újra később.</translation>
<source>Export</source>
<translation>Exportálás</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Megtestesüléskép kiválasztása</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2544,11 +2574,6 @@ Másolja ki, és ossza meg barátaival!</translation>
<source>Welcome to</source>
<translation>Isten hozott</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Megosztás, szabadon és bizalmasan Jami-vel</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2740,26 +2765,11 @@ Másolja ki, és ossza meg barátaival!</translation>
<source>Remove</source>
<translation>EltávolÃtás</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>A rajcsoportos technológiára való áttelepÃtés lehetÅ‘vé teszi ennek a beszélgetésnek az összehongolását több eszközön keresztül, és javÃtja a megbÃzhatóságot. A folyamat során az örökölt beszélgetési elÅ‘zmények törlÅ‘dnek.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Beszélgetés áttelepÃtése</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Valóban szeretné törölni ezt a csevegését?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Valóban szeretné letiltani ezt a beszélgetést?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2916,26 +2926,11 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>Dismiss</source>
<translation>ElutasÃtás</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Adjon hozzá egy képet és egy becenevet a profil befejezéséhez</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ez a profil csak a fiók kapcsolattartóival van megosztva.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>A profilja csak a kapcsolataival kerül megosztásra</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Miért szükséges elmenteni egy fiókot?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3652,120 +3647,120 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>What does Jami mean?</source>
<translation>Mit jelent a Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>A Jami névválasztást a szuahéli jamii szó ihlette, amely főnévként közösséget jelent, határozószóként pedig együtt.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Mi a zöld pont a fiókom mellett?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>A piros pont azt jelenti, hogy fiókja le van választva a hálózatról, és zöldre vált, amikor csatlakozik</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Miért szükséges biztonsági másolatot készÃteni egy fiókról?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>A Jamit úgy terjesztik, hogy a fiókadatok csak azon az eszközön tárolódnak, amelyen a fiók be van állÃtva. Ha a jelszó vagy az adatok elvesznek, a fiókot nem lehet visszaállÃtani.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>IndÃthatok konferenciahÃvást?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>HÃvás közben a „RésztvevÅ‘k hozzáadása†lehetÅ‘ségre kattintva vehet fel egy kapcsolat a hÃvásba</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Van Jaminak csoportos csevegése?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>A rajcsoportok támogatása a BeállÃtásokban engedélyezhetÅ‘ (kÃsérleti)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Mi az a Jami-fiók?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>A Jami-fiók egy nyilvános kulcsú titkosÃtás. A fiókot Jami-azonosÃtó azonosÃtja, amely a nyilvános kulcs ujjlenyomata.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Milyen adatokat kell megadni a Jami-fiók létrehozásához?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Új Jami-fiók létrehozásakor, nem kell olyan személyes adatokat szolgáltatnia, mint cÃm, telefonszám vagy e-mail-cÃm.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Miért nem szükséges jelszót használni?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>A Jami használatával fiókja az eszközén lévÅ‘ mappában tárolódik. A jelszót csak fiókja titkosÃtására használjuk, hogy megvédjük Önt azoktól, akik fizikailag hozzáférnek az eszközéhez.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Miért nem szükséges felhasználónevet regisztrálni?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>A legállandóbb és legbiztonságosabb azonosÃtó a Jami-azonosÃtó, de mivel egyesek számára nehézkes a használata, lehetÅ‘ség van felhasználónév regisztrálására is.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Hogyan készÃthetÅ‘ biztonsági másolat egy fiókról?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>A FiókbeállÃtásokban elérhetÅ‘ egy gomb a fiók biztonsági mentéséhez.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Miért nem szükséges jelszót használni?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Mi történik a fiók törlésekor?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Miért nem szükséges felhasználónevet regisztrálni?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>A fiók csak azokon az eszközökön tárolódik, amelyek a fiókkal lettek beállÃtva. A fiók véglegesen törlÅ‘dik, és nem állÃtható vissza, ha a fiókot minden eszközrÅ‘l törli.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>A legállandóbb és legbiztonságosabb azonosÃtó a Jami-azonosÃtó, de mivel egyesek számára nehézkes a használata, lehetÅ‘ség van felhasználónév regisztrálására is.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Használható egy fiók több eszközön?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Hogyan készÃthetÅ‘ biztonsági másolat egy fiókról?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Igen, összekapcsolhatja fiókját a beállÃtásokból, vagy importálhatja a biztonsági mentést egy másik eszközre.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Mi történik a fiók törlésekor?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_id.ts b/translations/lrc_id.ts
index 1d1daae61b62b0467b495a6d9144528ccafc2d17..9c59bec66696af0cc77e191416e5c40942648033 100644
--- a/translations/lrc_id.ts
+++ b/translations/lrc_id.ts
@@ -50,42 +50,42 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="95"/>
<source>Private</source>
- <translation type="unfinished"/>
+ <translation>Privat</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="97"/>
<source>Private group (restricted invites)</source>
- <translation type="unfinished"/>
+ <translation>Grup privat (undangan terbatas)</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="99"/>
<source>Private group</source>
- <translation type="unfinished"/>
+ <translation>Grup privat</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="101"/>
<source>Public group</source>
- <translation type="unfinished"/>
+ <translation>Grup publik</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Terjadi error saat mengambil repositori ini</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Modus percakapan tidak dikenali</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>Pesan yang tidak valid terdeteksi</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Tidak cukup otorisasi untuk memperbarui info percakapan</translation>
</message>
</context>
<context>
@@ -129,7 +129,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="38"/>
<source>Find a user or search for a conversation</source>
- <translation type="unfinished"/>
+ <translation>Temukan pengguna atau cari percakapan</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="39"/>
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -222,7 +227,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="72"/>
<source>Authentication required</source>
- <translation type="unfinished"/>
+ <translation>Diperlukan autentikasi</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="73"/>
@@ -307,7 +312,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="91"/>
<source>Select a new ringtone</source>
- <translation type="unfinished"/>
+ <translation>Pilih nada dering baru</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
@@ -362,7 +367,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="108"/>
<source>Allow fallback on RTP</source>
- <translation type="unfinished"/>
+ <translation>Izinkan Fallback pada RTP</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="109"/>
@@ -412,7 +417,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="118"/>
<source>Audio input device selector</source>
- <translation type="unfinished"/>
+ <translation>Pemilih perangkat input audio</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="119"/>
@@ -427,12 +432,12 @@ Jami will now quit.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="121"/>
<source>Select a private key</source>
- <translation type="unfinished"/>
+ <translation>Pilih kunci privat</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="122"/>
<source>Select a user certificate</source>
- <translation type="unfinished"/>
+ <translation>Pilih sertifikat pengguna</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="123"/>
@@ -457,7 +462,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="129"/>
<source>Registration expiration time (seconds)</source>
- <translation type="unfinished"/>
+ <translation>Waktu kedaluwarsa pendaftaran (detik)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="130"/>
@@ -643,7 +648,7 @@ Jami will now quit.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="178"/>
<source>Audio and Video Settings</source>
- <translation type="unfinished"/>
+ <translation>Pengaturan Audio dan Video</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="179"/>
@@ -718,12 +723,12 @@ Jami will now quit.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="197"/>
<source>Frames per second</source>
- <translation type="unfinished"/>
+ <translation>Frame per detik</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="198"/>
<source>Select video frame rate (frames per second)</source>
- <translation type="unfinished"/>
+ <translation>Pilih laju frame video (frame per detik)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="199"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Buang percakapan</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Konfirmasi kata sandi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opsional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Nama pengguna sudah diambil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1457,7 +1538,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
- <translation type="unfinished"/>
+ <translation>Aktifkan akun</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1513,7 +1578,7 @@ The profile can be changed at all time in the account's settings.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="394"/>
<source>Register username</source>
- <translation type="unfinished"/>
+ <translation>Daftarkan nama pengguna</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="395"/>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Kontak yang diblokir</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2088,7 +2138,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="547"/>
<source>Enter the PIN from another configured Jami account. Use the "Link Another Device" feature to obtain a PIN.</source>
- <translation type="unfinished"/>
+ <translation>Masukkan PIN dari akun Jami lain yang dikonfigurasi. Gunakan fitur "Tautkan Perangkat Lain" untuk mendapatkan PIN.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="549"/>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2293,7 +2328,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
- <translation type="unfinished"/>
+ <translation>Tampilkan atau sembunyikan preferensi</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="599"/>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Selamat datang di</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2669,7 +2699,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="701"/>
<source>Enable local moderators</source>
- <translation type="unfinished"/>
+ <translation>Mengaktifkan moderator lokal</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="702"/>
@@ -2732,25 +2762,10 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Hapus</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
+ <translation>Memigrasi percakapan</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Abaikan</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profil Anda hanya dibagikan kepada kontak Anda</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ig.ts b/translations/lrc_ig.ts
index 5f42ca01edd56c652f038a45305b7ac082bdc285..b711e86afee900dc99d4a56767a01024805a7687 100644
--- a/translations/lrc_ig.ts
+++ b/translations/lrc_ig.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_it.ts b/translations/lrc_it.ts
index 5605ce785798ba72705b30efe2e5b6350e9b411b..fe36ae058142d21ed047628295483206c71f431a 100644
--- a/translations/lrc_it.ts
+++ b/translations/lrc_it.ts
@@ -70,22 +70,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Si è verificato un errore durante il recupero di questo repository</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>La modalità della conversazione non è riconosciuta</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>È stato rilevato un messaggio non valido</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Non ci sono abbastanza autorizzazioni per aggiornare le informazioni sulla conversazione</translation>
</message>
</context>
<context>
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami è una piattaforma di comunicazione universale, con alla base la privacy, realizzata su una rete distribuita e libera per tutti.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami ora si chiuderà .</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Il tuo account esiste solo su questo dispositivo. Se perdi il tuo dispositivo o disinstalli l'applicazione, il tuo account verrà eliminato e non potrà essere recuperato. Puoi eseguire il backup del tuo account ora o più tardi.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fai qui il backup dell'account</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fai il backup del tuo account!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fai il backup dell'account</translation>
+ <source>Back up account</source>
+ <translation>Salva account</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -951,22 +1076,17 @@ Jami ora si chiuderà .</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Sul lato</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>In alto</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Nascondi te stesso</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1014,6 +1134,16 @@ Jami ora si chiuderà .</translation>
<source>Remove conversation</source>
<translation>Rimuovi conversazione</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1127,7 +1257,7 @@ Jami ora si chiuderà .</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Opzioni di disposizione</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami ora si chiuderà .</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Questo è l'errore del back-end: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1261,21 +1391,11 @@ Jami ora si chiuderà .</translation>
<source>Confirm password</source>
<translation>Conferma password</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Scegli una password per cifrare il tuo account su questo dispositivo. Nota che la password non può essere recuperata.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Facoltativo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Puoi scegliere un nome utente per essere facilmente trovato e contattato su Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ Jami ora si chiuderà .</translation>
<source>Username already taken</source>
<translation>Nome utente già utilizzato</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sei sicuro di volerti iscrivere in Jami senza un nome utente?
-In caso affermativo, a questo account verrà assegnato solo un identificatore di 40 caratteri generato casualmente.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caratteri al massimo
-- Caratteri alfabetici (dalla A alla Z)
-- Caratteri numerici (da 0 a 9)
-- Carattere speciale autorizzato: trattino (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Encrypt</source>
<translation>Cifrare</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Questo account viene creato localmente</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Scegliere un nome utente è consigliato e non può essere modificato</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>La cifratura dell'account con una password è facoltativa e non può essere recuperata.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>L'immagine e il soprannome sono facoltativi e possono essere modificati nelle impostazioni.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Change current password</source>
<translation>Cambia la password attuale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Fai il backup dell'account su un file .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,28 +1551,11 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Customize profile</source>
<translation>Personalizza il profilo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Questo profilo è condiviso solo con i contatti di questo account.
-Il profilo può essere modificato in qualsiasi momento nelle impostazioni dell'account.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Cifrare l'account con una password</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un account Jami è registrato solo su questo dispositivo come archivio contenente le chiavi del proprio account. L'accesso a questo archivio può essere protetto da una password.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Si noti che se si perde la password non è possibile recuperarla!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1588,16 +1648,6 @@ Per favore riprova più tardi.</translation>
<source>Banned contacts</source>
<translation>Contatti bloccati</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Vuoi davvero eliminare questo account?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se non hai fatto il backup del tuo account o non l'hai collegato a un altro dispositivo, il tuo account e il tuo nome registrato saranno persi per sempre.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2053,11 +2103,6 @@ Vuoi aggiornare ora?</translation>
<source>Create your account from a backup</source>
<translation>Crea il tuo account da un backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>È possibile ottenere un archivio facendo clic su "Fai il backup dell'account" nelle impostazioni dell'account. Questo creerà un file .gz sul tuo dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2148,16 +2193,6 @@ Vuoi aggiornare ora?</translation>
<source>Choose the account to link</source>
<translation>Scegli l'account da collegare</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Seleziona "Collega un altro dispositivo".</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Il codice PIN sarà disponibile per 10 minuti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2218,11 +2253,6 @@ Vuoi aggiornare ora?</translation>
<source>Export</source>
<translation>Esporta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Scegli una foto profilo</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2545,11 +2575,6 @@ Copia e condividi con i tuoi amici!</translation>
<source>Welcome to</source>
<translation>Benvenuto su</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Condividi, liberamente e privatamente con Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2741,26 +2766,11 @@ Copia e condividi con i tuoi amici!</translation>
<source>Remove</source>
<translation>Rimuovi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migrazione alla tecnologia "Gruppo" consentirà la sincronizzazione di queste conversazioni su più dispositivi e migliorerà l'affidabilità . La cronologia delle conversazioni precedenti verrà cancellata durante il processo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migrare la conversazione</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Vuoi davvero rimuovere questa conversazione?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Vuoi davvero bloccare questa conversazione?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2927,11 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Dismiss</source>
<translation>Ignora</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Aggiungi una foto e un soprannome per completare il tuo profilo</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Questo profilo è condiviso solo con i contatti di questo account.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Il tuo profilo è condiviso solo con i tuoi contatti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Perché dovrei salvare il mio account?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3648,120 @@ si connetta per sincronizzare la conversazione.</translation>
<source>What does Jami mean?</source>
<translation>Cosa significa Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>La scelta del nome Jami è stata ispirata dalla parola Swahili "jamii", che significa comunità come sostantivo e insieme come avverbio.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Cos'è il pallino verde accanto al mio account?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un punto rosso significa che l'account è disconnesso dalla rete, mentre diventa verde quando è connesso.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Perché dovrei fare il backup del mio account?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami è distribuito e il tuo account è memorizzato solo sul tuo dispositivo. Se si perde la password o i dati, non è possibile recuperarli.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Posso fare una teleconferenza?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>In una chiamata, è possibile fare clic su "Aggiungi partecipanti" per aggiungere un contatto alla chiamata.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Jami ha chat di gruppo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Nelle impostazioni, è possibile abilitare i gruppi (sperimentale)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Che cos'è un conto Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un account Jami è una chiave di cifratura asimmetrica. Il tuo account è identificato da un ID Jami, che è un'impronta digitale della tua chiave pubblica.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quali informazioni devo fornire per creare un account Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Quando si crea un nuovo account Jami, non è necessario fornire informazioni private come e-mail, indirizzo o numero di telefono.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Perché non devo usare una password?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Con Jami, il tuo account viene memorizzato in una cartella del tuo dispositivo. La password viene utilizzata solo per cifrare l'account, al fine di proteggerlo da chi ha accesso fisico al dispositivo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Perché non devo registrare un nome utente?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identificatore più sicuro è l'ID Jami, ma poiché per alcuni è difficile da usare, è possibile registrare anche un nome utente.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Come posso fare il backup del mio account?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Nelle impostazioni dell'account è disponibile un pulsante per eseguire il backup dell'account.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Perché non devo usare una password?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Cosa succede quando elimino il mio account?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Perché non devo registrare un nome utente?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Il tuo account è memorizzato solo sui tuoi dispositivi. Se si elimina l'account da ogni dispositivo, l'account è scomparso e non è più possibile recuperarlo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identificatore più sicuro è l'ID Jami, ma poiché per alcuni è difficile da usare, è possibile registrare anche un nome utente.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Posso utilizzare il mio account su più dispositivi?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Come posso fare il backup del mio account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Sì, è possibile collegare il proprio account dalle impostazioni, oppure importare il backup su un altro dispositivo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Cosa succede quando elimino il mio account?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_it_IT.ts b/translations/lrc_it_IT.ts
index c78eb27e097aabcd7c3fb939ac1bfcbd74ae5fd9..65140451adc01d7bdd6a5613fb55050dcc57f0b3 100644
--- a/translations/lrc_it_IT.ts
+++ b/translations/lrc_it_IT.ts
@@ -70,22 +70,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Si è verificato un errore durante il recupero di questo repository</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>La modalità della conversazione non è riconosciuta</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>È stato rilevato un messaggio non valido</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Non ci sono abbastanza autorizzazioni per aggiornare le informazioni sulla conversazione</translation>
</message>
</context>
<context>
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami è una piattaforma di comunicazione universale, con alla base la privacy, realizzata su una rete distribuita e libera per tutti.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami ora si chiuderà .</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Il tuo account esiste solo su questo dispositivo. Se perdi il tuo dispositivo o disinstalli l'applicazione, il tuo account verrà eliminato e non potrà essere recuperato. Puoi eseguire il backup del tuo account ora o più tardi.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fai qui il backup dell'account</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fai il backup del tuo account!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fai il backup dell'account</translation>
+ <source>Back up account</source>
+ <translation>Salva account</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -951,22 +1076,17 @@ Jami ora si chiuderà .</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Sul lato</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>In alto</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Nascondi te stesso</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1014,6 +1134,16 @@ Jami ora si chiuderà .</translation>
<source>Remove conversation</source>
<translation>Rimuovi conversazione</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1127,7 +1257,7 @@ Jami ora si chiuderà .</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Opzioni di disposizione</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami ora si chiuderà .</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Questo è l'errore del back-end: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1261,21 +1391,11 @@ Jami ora si chiuderà .</translation>
<source>Confirm password</source>
<translation>Conferma password</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Scegli una password per cifrare il tuo account su questo dispositivo. Nota che la password non può essere recuperata.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Facoltativo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Puoi scegliere un nome utente per essere facilmente trovato e contattato su Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ Jami ora si chiuderà .</translation>
<source>Username already taken</source>
<translation>Nome utente già utilizzato</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sei sicuro di volerti iscrivere in Jami senza un nome utente?
-In caso affermativo, a questo account verrà assegnato solo un identificatore di 40 caratteri generato casualmente.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caratteri al massimo
-- Caratteri alfabetici (dalla A alla Z)
-- Caratteri numerici (da 0 a 9)
-- Carattere speciale autorizzato: trattino (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Encrypt</source>
<translation>Cifrare</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Questo account viene creato localmente</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Scegliere un nome utente è consigliato e non può essere modificato</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>La cifratura dell'account con una password è facoltativa e non può essere recuperata.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>L'immagine e il soprannome sono facoltativi e possono essere modificati nelle impostazioni.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Change current password</source>
<translation>Cambia la password attuale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Fai il backup dell'account su un file .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,28 +1551,11 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Customize profile</source>
<translation>Personalizza il profilo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Questo profilo è condiviso solo con i contatti di questo account.
-Il profilo può essere modificato in qualsiasi momento nelle impostazioni dell'account.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Cifrare l'account con una password</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un account Jami è registrato solo su questo dispositivo come archivio contenente le chiavi del proprio account. L'accesso a questo archivio può essere protetto da una password.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Si noti che se si perde la password non è possibile recuperarla!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1588,16 +1648,6 @@ Per favore riprova più tardi.</translation>
<source>Banned contacts</source>
<translation>Contatti bloccati</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Vuoi davvero eliminare questo account?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se non hai fatto il backup del tuo account o non l'hai collegato a un altro dispositivo, il tuo account e il tuo nome registrato saranno persi per sempre.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2053,11 +2103,6 @@ Vuoi aggiornare ora?</translation>
<source>Create your account from a backup</source>
<translation>Crea il tuo account da un backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>È possibile ottenere un archivio facendo clic su "Fai il backup dell'account" nelle impostazioni dell'account. Questo creerà un file .gz sul tuo dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2148,16 +2193,6 @@ Vuoi aggiornare ora?</translation>
<source>Choose the account to link</source>
<translation>Scegli l'account da collegare</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Seleziona "Collega un altro dispositivo".</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Il codice PIN sarà disponibile per 10 minuti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2218,11 +2253,6 @@ Vuoi aggiornare ora?</translation>
<source>Export</source>
<translation>Esporta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Scegli una foto profilo</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2545,11 +2575,6 @@ Copia e condividi con i tuoi amici!</translation>
<source>Welcome to</source>
<translation>Benvenuto su</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Condividi, liberamente e privatamente con Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2741,26 +2766,11 @@ Copia e condividi con i tuoi amici!</translation>
<source>Remove</source>
<translation>Rimuovi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migrazione alla tecnologia "Gruppo" consentirà la sincronizzazione di queste conversazioni su più dispositivi e migliorerà l'affidabilità . La cronologia delle conversazioni precedenti verrà cancellata durante il processo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migrare la conversazione</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Vuoi davvero rimuovere questa conversazione?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Vuoi davvero bloccare questa conversazione?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2927,11 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Dismiss</source>
<translation>Ignora</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Aggiungi una foto e un soprannome per completare il tuo profilo</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Questo profilo è condiviso solo con i contatti di questo account.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Il tuo profilo è condiviso solo con i tuoi contatti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Perché dovrei salvare il mio account?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3648,120 @@ si connetta per sincronizzare la conversazione.</translation>
<source>What does Jami mean?</source>
<translation>Cosa significa Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>La scelta del nome Jami è stata ispirata dalla parola Swahili "jamii", che significa comunità come sostantivo e insieme come avverbio.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Cos'è il punto verde accanto al mio account?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un punto rosso significa che l'account è disconnesso dalla rete, mentre diventa verde quando è connesso.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Perché dovrei fare il backup del mio account?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami è distribuito e il tuo account è memorizzato solo sul tuo dispositivo. Se si perde la password o i dati, non è possibile recuperarli.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Posso fare una teleconferenza?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>In una chiamata, è possibile fare clic su "Aggiungi partecipanti" per aggiungere un contatto alla chiamata.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Jami ha chat di gruppo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Nelle impostazioni, è possibile abilitare i gruppi (sperimentale)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Che cos'è un conto Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un account Jami è una chiave di cifratura asimmetrica. Il tuo account è identificato da un ID Jami, che è un'impronta digitale della tua chiave pubblica.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quali informazioni devo fornire per creare un account Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Quando si crea un nuovo account Jami, non è necessario fornire informazioni private come e-mail, indirizzo o numero di telefono.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Perché non devo usare una password?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Con Jami, il tuo account viene memorizzato in una cartella del tuo dispositivo. La password viene utilizzata solo per cifrare l'account, al fine di proteggerlo da chi ha accesso fisico al dispositivo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Perché non devo registrare un nome utente?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identificatore più sicuro è l'ID Jami, ma poiché per alcuni è difficile da usare, è possibile registrare anche un nome utente.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Come posso fare il backup del mio account?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Nelle impostazioni dell'account è disponibile un pulsante per eseguire il backup dell'account.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Perché non devo usare una password?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Cosa succede quando elimino il mio account?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Perché non devo registrare un nome utente?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Il tuo account è memorizzato solo sui tuoi dispositivi. Se si elimina l'account da ogni dispositivo, l'account è scomparso e non è più possibile recuperarlo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identificatore più sicuro è l'ID Jami, ma poiché per alcuni è difficile da usare, è possibile registrare anche un nome utente.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Posso utilizzare il mio account su più dispositivi?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Come posso fare il backup del mio account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Sì, è possibile collegare il proprio account dalle impostazioni, oppure importare il backup su un altro dispositivo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Cosa succede quando elimino il mio account?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_ja.ts b/translations/lrc_ja.ts
index 02c34d442e785e1f087f2353231ed42728be4768..c62def4baee8a2868d8c61e84620905526821131 100644
--- a/translations/lrc_ja.ts
+++ b/translations/lrc_ja.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,24 +757,144 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>アカウントをãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã—ã¦ãã ã•ã„ï¼</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>アカウントをãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>会話を削除</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>パスワードã®å†å…¥åŠ›</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>オプション</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>ã™ã§ã«å–å¾—ã•ã‚Œã¦ã„るユーザーåã§ã™</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>追放ã•ã‚ŒãŸé€£çµ¡å…ˆ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>アカウントè¨å®šã§ã€Œã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã™ã‚‹ã€ã‚’実行ã—ã¦ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã§ãã¾ã™ã€‚機器ã«.gzファイルãŒä¿å˜ã•ã‚Œã¾ã™ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>エクスãƒãƒ¼ãƒˆ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>よã†ã“ã</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>削除</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>ã“ã®ä¼šè©±ã‚’退出ã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>退出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>プãƒãƒ•ã‚£ãƒ¼ãƒ«ã¯é€£çµ¡å…ˆä»¥å¤–ã«å…±æœ‰ã•ã‚Œã¾ã›ã‚“</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_kk.ts b/translations/lrc_kk.ts
index e04a5e1efdf9857ce54dc9d2c27c8f0e9d13050e..f38c81888064be2c3179ccc07112ee445092416a 100644
--- a/translations/lrc_kk.ts
+++ b/translations/lrc_kk.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_kn.ts b/translations/lrc_kn.ts
index 6586e9e10dc054edb5f078807d0d953b8ac0a175..cf47971da025e616334a838bd74d1858390a9847 100644
--- a/translations/lrc_kn.ts
+++ b/translations/lrc_kn.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ko.ts b/translations/lrc_ko.ts
index 19c3ff921f69b973e2a30d348913726c4e6e04be..d74058daf62be8a85180bfd4706f9b3aa9a5ebf3 100644
--- a/translations/lrc_ko.ts
+++ b/translations/lrc_ko.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>암호 확ì¸</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>내보내기</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ko_KR.ts b/translations/lrc_ko_KR.ts
index 30f30ab9d887a573fecdae589ca5de706506c904..e1d682ecd9fdd4272382889677948a4da05e7c0a 100644
--- a/translations/lrc_ko_KR.ts
+++ b/translations/lrc_ko_KR.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>암호 확ì¸</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>내보내기</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_lt.ts b/translations/lrc_lt.ts
index b6000554e38e35dd3a7107196b569c85f5dd2256..23f253218bbdce2e16125819fb9f7ae153bdf627 100644
--- a/translations/lrc_lt.ts
+++ b/translations/lrc_lt.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Padaryti paskyros atsarginÄ™ kopijÄ…</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Šalinti pokalbį</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Patvirtinkite slaptažodį</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Naudotojo vardas jau užimtas</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Užblokuoti adresatai</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Eksportuoti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Nukopijuokite ir dalinkitÄ—s juo su draugais!</translation>
<source>Welcome to</source>
<translation>Sveiki atvykę į</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Nukopijuokite ir dalinkitÄ—s juo su draugais!</translation>
<source>Remove</source>
<translation>Å alinti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ar tikrai norite pašalinti šį pokalbį?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Jūsų profilis yra bendrinamas tik su jūsų adresatais</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ml.ts b/translations/lrc_ml.ts
index f2d66ed0d5c7533ddc0e787935562bb6fd840dd1..eab123ade2a474bae9963ffc50a40d38b85a2f3e 100644
--- a/translations/lrc_ml.ts
+++ b/translations/lrc_ml.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_mn_MN.ts b/translations/lrc_mn_MN.ts
index 87c86701b7a88384f6845c900add061c2274a49e..414c5a07859f2b00b8284223bb9e9259c38b157b 100644
--- a/translations/lrc_mn_MN.ts
+++ b/translations/lrc_mn_MN.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_mr.ts b/translations/lrc_mr.ts
index c1993b08128c2461bd7f4f69aa3fa49b2c075744..c82ec7c510a3bb4b628ef7d9f06e4dd3bea44089 100644
--- a/translations/lrc_mr.ts
+++ b/translations/lrc_mr.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ms.ts b/translations/lrc_ms.ts
index 0345563f51bc4d9eea6fa09da37dbbfd6d491862..a38f1a883619f45d9e3ca11fd71c570b7b0e8320 100644
--- a/translations/lrc_ms.ts
+++ b/translations/lrc_ms.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation>Eksport akaun</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Sahkan kata laluan</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Nama pengguna telah digunakan pengguna lain</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Eksport</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Hapus</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_nb.ts b/translations/lrc_nb.ts
index e4fa9ff588bb048c25cbbcece1c702ff93a8dbbc..d62fd0221e2e2a1b35e57dd6cbbec9bbd83f6126 100644
--- a/translations/lrc_nb.ts
+++ b/translations/lrc_nb.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami avslutter nå.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sikkerhetskopier kontoen her</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Sikkerhetskopier din konto!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sikkerhetskopier konto</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami avslutter nå.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami avslutter nå.</translation>
<source>Remove conversation</source>
<translation>Slett samtale</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami avslutter nå.</translation>
<source>Confirm password</source>
<translation>Bekreft passord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Velg et passord for å kryptere kontoen din på denne enheten. Merk at passordet ikke kan gjenopprettes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Valgfritt</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami avslutter nå.</translation>
<source>Username already taken</source>
<translation>Brukernavnet er allerede i bruk</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Endre nåværende passord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sikkerhetskopier konto til en .gz fil</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Vennligst forsøk igjen senere.</translation>
<source>Banned contacts</source>
<translation>Blokkerte kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Ønsker du virkelig å slette denne kontoen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Vennligst forsøk igjen senere.</translation>
<source>Create your account from a backup</source>
<translation>Gjenopprett din konto fra en sikkerhetskopi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Du kan skaffe et arkiv ved å klikke på "Sikkerhetskopier konto" i kontoinnstillingene. Dette vil opprette en .gz-fil på enheten din.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Vennligst forsøk igjen senere.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Vennligst forsøk igjen senere.</translation>
<source>Export</source>
<translation>Eksporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Velg et bilde som avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Kopier og del det med dine venner!</translation>
<source>Welcome to</source>
<translation>Velkommen til</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Kopier og del det med dine venner!</translation>
<source>Remove</source>
<translation>Slett</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ønsker du virkelig å fjerne denne samtalen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>Dismiss</source>
<translation>Avvis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Din profil deles bare med dine kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ kobler seg til for å synkronisere samtalen.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ne.ts b/translations/lrc_ne.ts
index 3043abe522827eea165380f7d20514f96550209f..2a68aba823a5e30465674cf56ef6b5be11d6ca2c 100644
--- a/translations/lrc_ne.ts
+++ b/translations/lrc_ne.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_nl.ts b/translations/lrc_nl.ts
index a1a37a34053fddee5458cdb7d19ee9f9e99dd5b2..b3c29ad5982c6ec9a9284d02146f09f2d90e8074 100644
--- a/translations/lrc_nl.ts
+++ b/translations/lrc_nl.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,24 +757,144 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Maak een back-up van uw account!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Reservekopie van account maken</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Gesprek verwijderen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Bevestig wachtwoord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optioneel</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Gebruikersnaam reeds in gebruik</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Exporteren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Deel deze met uw vrienden!</translation>
<source>Welcome to</source>
<translation>Welkom bij</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Deel deze met uw vrienden!</translation>
<source>Remove</source>
<translation>Verwijderen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wilt u dit gesprek echt verwijderen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Negeren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Uw profiel wordt enkel gedeeld met uw contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_nl_BE.ts b/translations/lrc_nl_BE.ts
index 4090dc505dc7461dceda7fbfc7d3ec01efac06d8..d7d97fa1dc4877a5aa93329ed7aa412be88e2178 100644
--- a/translations/lrc_nl_BE.ts
+++ b/translations/lrc_nl_BE.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Maak een back-up van uw account!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Back-up maken van account</translation>
+ <source>Back up account</source>
+ <translation>Reservekopie van account maken</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Gesprek verwijderen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Bevestig paswoord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optioneel</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Gebruikersnaam reeds in gebruik</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Exporteren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Deel hem met uw vrienden!</translation>
<source>Welcome to</source>
<translation>Welkom bij</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Deel hem met uw vrienden!</translation>
<source>Remove</source>
<translation>Verwijderen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wilt u dit gesprek echt verwijderen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Negeren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Uw profiel wordt enkel gedeeld met uw contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_nl_NL.ts b/translations/lrc_nl_NL.ts
index bea305d77421b42a25f5187e531ea7af1a39146d..0ae12c6667377933626bec4034022be652b15cd3 100644
--- a/translations/lrc_nl_NL.ts
+++ b/translations/lrc_nl_NL.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,24 +757,144 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Maak een back-up van uw account!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Reservekopie van account maken</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Gesprek verwijderen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Bevestig paswoord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optioneel</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Gebruikersnaam reeds in gebruik</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Exporteren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Deel hem met uw vrienden!</translation>
<source>Welcome to</source>
<translation>Welkom bij</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Deel hem met uw vrienden!</translation>
<source>Remove</source>
<translation>Verwijderen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wilt u dit gesprek echt verwijderen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Negeren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Uw profiel wordt enkel gedeeld met uw contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_nn.ts b/translations/lrc_nn.ts
index fd030b805225ef6dc454122b592d4c44e5580449..5b9f05d76ab5e425cfac2f16f9e73cec98755302 100644
--- a/translations/lrc_nn.ts
+++ b/translations/lrc_nn.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_oc.ts b/translations/lrc_oc.ts
index 6f923d7bc1b545fbb6105bef9d8d9ffe7f35ece4..72611142b3bb70e387d6f6bd62a81fa74695b2a9 100644
--- a/translations/lrc_oc.ts
+++ b/translations/lrc_oc.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Salvagardatz vòstre compte !</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Suprimir discutida</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Confirmar lo senhal</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Nom d’utilizaire ja pres</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contactes forabandits</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation>
<source>Welcome to</source>
<translation>La benvenguda a Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation>
<source>Remove</source>
<translation>Suprimir</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_pa.ts b/translations/lrc_pa.ts
index 0820c29307b42792bc223d1b1e5280b33f50564e..70af6f536d9bd2017a0b3b038f052d54854ea254 100644
--- a/translations/lrc_pa.ts
+++ b/translations/lrc_pa.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>ਆਪਣੇ ਖਾਤੇ ਦਾ ਬੈਕਅੱਪ ਲਓ!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>ਬੈਕਅੱਪ ਖਾਤਾ</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>ਮਰਜ਼ੀ ਮà©à¨¤à¨¾à¨¬à¨•</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲਿਆ ਗਿਆ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>ਬੈਕਅੱਪ ਤੋਂ ਆਪਣਾ ਖਾਤਾ ਬਣਾਓ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>ਖਾਰਜ ਕਰੋ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>ਤà©à¨¹à¨¾à¨¡à©€ ਪà©à¨°à©‹à¨«à¨¾à¨ˆà¨² ਸਿਰਫ਼ ਤà©à¨¹à¨¾à¨¡à©‡ ਸੰਪਰਕਾਂ ਨਾਲ ਸਾਂà¨à¨¾ ਕੀਤੀ ਜਾਂਦੀ ਹੈ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_pl.ts b/translations/lrc_pl.ts
index 1b412ca8cd6f31f944d90ca24ffa8c50dccc62e1..5a83526c916f9fd2d41c573ba3a8f8e8a810df2c 100644
--- a/translations/lrc_pl.ts
+++ b/translations/lrc_pl.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Twoje konto istnieje wyłącznie na tym urządzeniu. Jeśli stracisz swoje urządzenie lub odinstalujesz aplikację, twoje konto zostanie usunięte i nie będzie możliwe jego odzyskanie. Możesz utworzyć kopię zapasową twojego konta teraz lub później.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Zabezpiecz swoje konto tutaj</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Zabezpiecz swoje konto!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Wykonaj kopiÄ™ zapasowÄ…</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Usuń rozmowę</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Potwierdź hasło</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Wybierz hasło do zaszyfrowania konta na tym urządzeniu. Pamiętaj że hasło nie będzie mogło zostać odzyskane.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcjonalne</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Nazwa użytkownika zajęta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Zmień obecne hasło</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Zapisz kopiÄ™ zapasowÄ… do pliku .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1582,16 +1647,6 @@ Spróbuj ponownie później.</translation>
<source>Banned contacts</source>
<translation>Zablokowane kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Czy jesteś pewien, że chcesz usunąć to konto?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Jeśli twoje konto nie posiada kopii zapasowej lub nie jest obecne na innym urządzeniu, twoje konto oraz zarejestrowana nazwa zostaną bezpowrotnie utracone.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2047,11 +2102,6 @@ Spróbuj ponownie później.</translation>
<source>Create your account from a backup</source>
<translation>Utwórz konto z kopii zapasowej</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Archiwum można uzyskać, klikając opcję „Kopia zapasowa konta†w ustawieniach konta. Spowoduje to utworzenie pliku .gz na Twoim urządzeniu.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2142,16 +2192,6 @@ Spróbuj ponownie później.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2212,11 +2252,6 @@ Spróbuj ponownie później.</translation>
<source>Export</source>
<translation>Wyeksportuj</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Wybierz obraz jako awatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2539,11 +2574,6 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<source>Welcome to</source>
<translation>Witaj!</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2735,26 +2765,11 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<source>Remove</source>
<translation>Usuń</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Czy na pewno chcesz usunąć tą rozmowę?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2908,26 +2923,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Odrzuć</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Twój profil jest udostępniany tylko twoim kontaktom</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3645,118 +3645,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_pl_PL.ts b/translations/lrc_pl_PL.ts
index a53092a98cd75677726a845f3c67018a229aa4f3..156b410b9915492f00d70b8267047bca833f51b5 100644
--- a/translations/lrc_pl_PL.ts
+++ b/translations/lrc_pl_PL.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Twoje konto istnieje wyłącznie na tym urządzeniu. Jeśli stracisz swoje urządzenie lub odinstalujesz aplikację, twoje konto zostanie usunięte i nie będzie możliwe jego odzyskanie. Możesz utworzyć kopię zapasową twojego konta teraz lub później.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Zabezpiecz swoje konto tutaj</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Zabezpiecz swoje konto!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Wykonaj kopiÄ™ zapasowÄ…</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Usuń rozmowę</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Potwierdź hasło</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Wybierz hasło do zaszyfrowania konta na tym urządzeniu. Pamiętaj że hasło nie będzie mogło zostać odzyskane.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcjonalne</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Nazwa użytkownika zajęta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Zmień obecne hasło</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Zapisz kopiÄ™ zapasowÄ… do pliku .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1582,16 +1647,6 @@ Spróbuj ponownie później.</translation>
<source>Banned contacts</source>
<translation>Zablokowane kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Czy jesteś pewien, że chcesz usunąć to konto?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Jeśli twoje konto nie posiada kopii zapasowej lub nie jest obecne na innym urządzeniu, twoje konto oraz zarejestrowana nazwa zostaną bezpowrotnie utracone.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2047,11 +2102,6 @@ Spróbuj ponownie później.</translation>
<source>Create your account from a backup</source>
<translation>Utwórz konto z kopii zapasowej</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Archiwum można uzyskać, klikając opcję „Kopia zapasowa konta†w ustawieniach konta. Spowoduje to utworzenie pliku .gz na Twoim urządzeniu.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2142,16 +2192,6 @@ Spróbuj ponownie później.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2212,11 +2252,6 @@ Spróbuj ponownie później.</translation>
<source>Export</source>
<translation>Wyeksportuj</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Wybierz obraz jako awatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2539,11 +2574,6 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<source>Welcome to</source>
<translation>Witaj!</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2735,26 +2765,11 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<source>Remove</source>
<translation>Usuń</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Czy na pewno chcesz usunąć tą rozmowę?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2908,26 +2923,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Odrzuć</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Twój profil jest udostępniany tylko twoim kontaktom</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3645,118 +3645,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_pt.ts b/translations/lrc_pt.ts
index ee2cba8549283355bf5a6c0024daf94e1d823a35..cdf97284d72b59dd649f9b32201b4fe0658bb8e6 100644
--- a/translations/lrc_pt.ts
+++ b/translations/lrc_pt.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami será finalizado agora.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Sua conta existe apenas neste dispositivo. Se você perder seu dispositivo ou desinstalar a aplicação, sua conta será deletada e não pode ser recuperada. Você pode fazer uma cópia da sua conta agora ou depois.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Conta de backup aqui</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faça um backup da sua conta!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Conta de cópia de segurança</translation>
+ <source>Back up account</source>
+ <translation>Criar cópia de segurança da conta</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami será finalizado agora.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami será finalizado agora.</translation>
<source>Remove conversation</source>
<translation>Remover conversação</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami será finalizado agora.</translation>
<source>Confirm password</source>
<translation>Confirmar palavra-chave</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Escolha uma senha para criptografar sua conta neste dispositivo. Observe que a senha não pode ser recuperada.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami será finalizado agora.</translation>
<source>Username already taken</source>
<translation>O nome de utilizador já está registado</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Alterar a senha atual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Backup a conta para um arquivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Por favor, tente novamente mais tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos banidos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Você realmente quer excluir esta conta?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se sua conta não foi copiada ou adicionada em outro dispositivo, sua conta e nome registrado será irrevogavelmente perdida.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Gostaria de atualizar agora?</translation>
<source>Create your account from a backup</source>
<translation>Criar sua conta de um backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Você pode obter um arquivo clicando no "Backup de conta" em configurações de conta. Isto criará um arquivo .gz em seu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Gostaria de atualizar agora?</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Gostaria de atualizar agora?</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Escolha uma foto como avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copie e o partilhe-o com os seus amigos!</translation>
<source>Welcome to</source>
<translation>Bem-vindo(a) Ã </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copie e o partilhe-o com os seus amigos!</translation>
<source>Remove</source>
<translation>Remover</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Quer mesmo remover esta conversação?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ conectar para sincronizar a conversação.</translation>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>O seu perfil é partilhado apenas com seus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ conectar para sincronizar a conversação.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_pt_BR.ts b/translations/lrc_pt_BR.ts
index 9dcb8776ea64b735b23822f33f57fcdbd1729fc9..264d7061fbca08cd88f11adaa7d43d353351e222 100644
--- a/translations/lrc_pt_BR.ts
+++ b/translations/lrc_pt_BR.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami será finalizado agora.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Sua conta existe apenas neste dispositivo. Se você perder seu dispositivo ou desinstalar a aplicação, sua conta será deletada e não pode ser recuperada. Você pode fazer uma cópia da sua conta agora ou depois.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Conta de backup aqui</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faça um backup da sua conta!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Cópia de segurança da conta</translation>
+ <source>Back up account</source>
+ <translation>Criar cópia de segurança da conta</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami será finalizado agora.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami será finalizado agora.</translation>
<source>Remove conversation</source>
<translation>Excluir uma conversa</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami será finalizado agora.</translation>
<source>Confirm password</source>
<translation>Confirmar senha</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Escolha uma senha para criptografar sua conta neste dispositivo. Observe que a senha não pode ser recuperada.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami será finalizado agora.</translation>
<source>Username already taken</source>
<translation>Nome de usuário já em uso</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Alterar a senha atual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Backup a conta para um arquivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Por favor, tente novamente mais tarde.</translation>
<source>Banned contacts</source>
<translation>Contatos banidos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Você realmente quer excluir esta conta?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se sua conta não foi copiada ou adicionada em outro dispositivo, sua conta e nome registrado será irrevogavelmente perdida.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Gostaria de atualizar agora?</translation>
<source>Create your account from a backup</source>
<translation>Criar sua conta de um backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Você pode obter um arquivo clicando no "Backup de conta" em configurações de conta. Isto criará um arquivo .gz em seu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Gostaria de atualizar agora?</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Gostaria de atualizar agora?</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Escolha uma foto como avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copie-o e compartilhe com seus amigos!</translation>
<source>Welcome to</source>
<translation>Bem-vindo à </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copie-o e compartilhe com seus amigos!</translation>
<source>Remove</source>
<translation>Remover</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Você realmente quer excluir esta conversa?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ conectar para sincronizar a conversação.</translation>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Seu perfil é compartilhado apenas com seus contatos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ conectar para sincronizar a conversação.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_pt_PT.ts b/translations/lrc_pt_PT.ts
index 7d1d2cf6a9656ec4d7920ca7dd74b504f29c07d0..e93f93015de83aace52e2a7b8c918292872d67e9 100644
--- a/translations/lrc_pt_PT.ts
+++ b/translations/lrc_pt_PT.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami será finalizado agora.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Sua conta existe apenas neste dispositivo. Se você perder seu dispositivo ou desinstalar a aplicação, sua conta será deletada e não pode ser recuperada. Você pode fazer uma cópia da sua conta agora ou depois.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Conta de backup aqui</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fazer cópia de segurança da sua conta!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Conta de cópia de segurança</translation>
+ <source>Back up account</source>
+ <translation>Criar cópia de segurança da conta</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami será finalizado agora.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami será finalizado agora.</translation>
<source>Remove conversation</source>
<translation>Remover conversação</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami será finalizado agora.</translation>
<source>Confirm password</source>
<translation>Confirmar palavra-chave</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Escolha uma senha para criptografar sua conta neste dispositivo. Observe que a senha não pode ser recuperada.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami será finalizado agora.</translation>
<source>Username already taken</source>
<translation>O nome de utilizador já está registado</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Alterar a senha atual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Backup a conta para um arquivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Por favor, tente novamente mais tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos banidos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Você realmente quer excluir esta conta?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se sua conta não foi copiada ou adicionada em outro dispositivo, sua conta e nome registrado será irrevogavelmente perdida.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Gostaria de atualizar agora?</translation>
<source>Create your account from a backup</source>
<translation>Criar sua conta de um backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Você pode obter um arquivo clicando no "Backup de conta" em configurações de conta. Isto criará um arquivo .gz em seu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Gostaria de atualizar agora?</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Gostaria de atualizar agora?</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Escolha uma foto como avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copie e o partilhe-o com os seus amigos!</translation>
<source>Welcome to</source>
<translation>Bem-vindo(a) Ã </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copie e o partilhe-o com os seus amigos!</translation>
<source>Remove</source>
<translation>Remover</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Quer mesmo remover esta conversação?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ conectar para sincronizar a conversação.</translation>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>O seu perfil é partilhado apenas com seus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ conectar para sincronizar a conversação.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ro.ts b/translations/lrc_ro.ts
index b9cc4af2c50346483578facc114170f2f913c547..cd1f5a8237c03d4c0b945b23b1e0177893dbfd67 100644
--- a/translations/lrc_ro.ts
+++ b/translations/lrc_ro.ts
@@ -70,22 +70,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>A apărut o eroare la obținerea acestui depozit</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Tipul conversației nu e recunoscut.</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>A fost detectat un mesaj greșit</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Autorizații insuficiente pentru actualizarea informațiilor despre conversație</translation>
</message>
</context>
<context>
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami este o platformă de comunicare universală, avînd la temelie confidențialitatea, care se bazează pe o rețea distribuită și liberă pentru oricine.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami se va închide acum.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Acest cont există doar în acest aparat. Dacă ai pierdut aparatul sau ai dezinstalat aplicația, contul tău va fi șters și nu va putea fi recuperat. Poți face o copie de rezervă acum sau mai tîrziu.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fă aici o copie de rezervă a contului</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fă o copie de rezervă a contului!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fă o copie de rezervă</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -951,22 +1076,17 @@ Jami se va închide acum.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>ÃŽn lateral</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>Sus</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Ascunde-te</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1014,6 +1134,16 @@ Jami se va închide acum.</translation>
<source>Remove conversation</source>
<translation>Șterge conversația</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1117,17 +1247,17 @@ Jami se va închide acum.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="294"/>
<source>Lower hand</source>
- <translation>Mîna jos</translation>
+ <translation>Coboară mîna</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="295"/>
<source>Raise hand</source>
- <translation>Mîna sus</translation>
+ <translation>Ridică mîna</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Opțiuni de aranjare</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami se va închide acum.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Eroarea serviciului din fundal: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1261,21 +1391,11 @@ Jami se va închide acum.</translation>
<source>Confirm password</source>
<translation>Confirmă parola</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Alege o parolă pentru a cifra contul tău în acest aparat. Reține că parola nu poate fi recuperată.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Facultativ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Poți alege un nume de utilizator pentru a fi ușor de găsit și de contactat pe Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ Jami se va închide acum.</translation>
<source>Username already taken</source>
<translation>Nume ales deja</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sigur vrei să te înscrii în Jami fără nume de utilizator?
-Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caractere generat aleatoriu.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- maximum 32 de caractere
-- Caractere alfabetice (de la A la Z)
-- Caractere numerice (de la 0 la 9)
-- Caracter special autorizat: liniuță (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Encrypt</source>
<translation>Cifrează</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Acest cont este creat local</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Este recomandată alegerea unui nume de utilizator, care nu poate fi schimbat.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Cifrarea contului tău cu o parolă este opțională, iar aceasta nu poate fi recuperată.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Imaginea și pseudonimul sînt opționale și pot fi modificate în reglări.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Change current password</source>
<translation>Schimbă parola actuală</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Copie de rezervă a contului ca fișier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,28 +1551,11 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Customize profile</source>
<translation>Personalizează profilul</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Acest profil este împărtășit doar cu contactele acestui cont.
-Profilul poate fi modificat în orice moment în reglările contului.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Cifrează contul cu o parolă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un cont Jami este înregistrat doar în acest aparat ca o arhivă care conține cheile contului tău. Accesul la această arhivă poate fi protejat printr-o parolă.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Atenție, dacă pierzi parola, aceasta nu poate fi recuperată!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1588,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contacte blocate</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Chiar vrei să ștergi acest cont?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Dacă contul tău nu a fost asociat altui aparat și nu ai o copie de rezervă, va fi pierdut definitiv împreună cu numele înscris.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2053,11 +2103,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>Creează contul tău dintr-o copie de rezervă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Poți obține o arhivă făcînd clic pe „Fă o copie de rezervă a contului†în reglările contului. Asta va crea un fișier .gz în aparatul tău.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2148,16 +2193,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation>Alege contul de asociat</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Alege „Asociază alt aparatâ€</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Codul PIN va fi disponibil timp de 10 minute.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2218,11 +2253,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Exportă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Alege o poză de profil</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2545,11 +2575,6 @@ Copiază-l și distribuie-l prietenilor!</translation>
<source>Welcome to</source>
<translation>Bine ai venit pe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Distribuie, în mod liber și privat, cu Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2741,26 +2766,11 @@ Copiază-l și distribuie-l prietenilor!</translation>
<source>Remove</source>
<translation>Elimină</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Transferul la tehnologia „Grup†va permite sincronizarea acestei conversații între mai multe aparate și va îmbunătăți calitatea. Cronologia conversațiilor vechi va fi ștearsă în acest proces.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Transferă conversația</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Chiar vrei să ștergi această conversație?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Chiar vrei să blochezi această conversație?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2916,26 +2926,11 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Dismiss</source>
<translation>Ignoră</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Adaugă o poză și un pseudonim pentru a-ți completa profilul</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Acest profil este distribuit doar contactelor acestui cont</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profilul tău este distribuit doar contactelor tale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>De ce ar trebui să-mi salvez contul?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3652,120 +3647,120 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>What does Jami mean?</source>
<translation>Ce înseamnă Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Alegerea numelui Jami a fost inspirată de cuvîntul Swahili „jamiiâ€, care înseamnă comunitate ca substantiv È™i împreună ca adverb.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Ce este punctul verde de lîngă contul meu?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un punct roșu înseamnă că acest cont este deconectat de la rețea, iar cînd este conectat devine verde.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>De ce ar trebui să fac o copie de rezervă a contului meu?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami este distribuit, iar contul tău este stocat doar în aparatul tău. Dacă pierzi parola sau datele tale, nu le poți recupera.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Pot face o teleconferință?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>În timpul unui apel, poți face clic pe „Adaugă participanți†pentru a adăuga un contact la apel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Are Jami discuții în grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>În reglări, poți activa grupurile (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Ce este un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un cont Jami este o cheie de cifrare asimetrică. Contul tău este identificat de un ID Jami, care este o amprentă a cheii tale publice.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Ce informații trebuie să furnizez pentru a crea un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Atunci cînd creezi un nou cont Jami, nu trebuie să furnizezi nicio informație privată, cum ar fi e-mailul, adresa sau numărul de telefon.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>De ce nu trebuie să folosesc o parolă?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Cu Jami, contul tău este stocat într-un dosar din aparatul tău. Parola este utilizată doar pentru a cifra contul tău, pentru a te proteja de cineva care are acces fizic la aparatul tău.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>De ce nu trebuie să înscriu un nume de utilizator?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Cel mai sigur identificator este ID-ul Jami, dar, deoarece acesta este dificil de utilizat pentru unele persoane, ai și opțiunea de a înscrie un nume de utilizator.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Cum pot face o copie de rezervă a contului meu?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>În reglările contului, este disponibil un buton pentru a face o copie de rezervă a contului.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>De ce nu trebuie să folosesc o parolă?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Ce se întîmplă dacă îmi șterg contul?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>De ce nu trebuie să înscriu un nume de utilizator?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Contul tău este stocat doar în aparatele tale. Dacă ștergi contul din fiecare aparat, contul dispare și nu îl mai poți recupera.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Cel mai sigur identificator este ID-ul Jami, dar, deoarece acesta este dificil de utilizat pentru unele persoane, ai și opțiunea de a înscrie un nume de utilizator.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Pot să-mi folosesc contul pe mai multe aparate?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Cum pot face o copie de rezervă a contului meu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Da, poți asocia contul tău din reglări sau poți importa copia de rezervă din alt aparat.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Ce se întîmplă dacă îmi șterg contul?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_ro_RO.ts b/translations/lrc_ro_RO.ts
index e4532365be2e2efa18dce56c3c7b15c70001c377..80eebf2c43a87c08b42d664d0580fe5787905072 100644
--- a/translations/lrc_ro_RO.ts
+++ b/translations/lrc_ro_RO.ts
@@ -70,22 +70,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>A apărut o eroare la obținerea acestui depozit</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Tipul conversației nu e recunoscut.</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>A fost detectat un mesaj greșit</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Autorizații insuficiente pentru actualizarea informațiilor despre conversație</translation>
</message>
</context>
<context>
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami este o platformă de comunicare universală, având la temelie confidențialitatea, care se bazează pe o rețea distribuită și liberă pentru oricine.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami se va închide acum.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Acest cont există doar în acest aparat. Dacă ai pierdut aparatul sau ai dezinstalat aplicația, contul tău va fi șters și nu va putea fi recuperat. Poți face o copie de rezervă acum sau mai târziu.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fă aici o copie de rezervă a contului</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fă o copie de rezervă a contului!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fă o copie de rezervă</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -951,22 +1076,17 @@ Jami se va închide acum.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>ÃŽn lateral</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>Sus</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Ascunde-te</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1014,6 +1134,16 @@ Jami se va închide acum.</translation>
<source>Remove conversation</source>
<translation>Șterge conversația</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1127,7 +1257,7 @@ Jami se va închide acum.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Opțiuni de aranjare</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami se va închide acum.</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Eroarea serviciului din fundal: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1261,21 +1391,11 @@ Jami se va închide acum.</translation>
<source>Confirm password</source>
<translation>Confirmă parola</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Alege o parolă pentru a cifra contul tău în acest aparat. Reține că parola nu poate fi recuperată.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Facultativ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Poți alege un nume de utilizator pentru a fi ușor de găsit și de contactat pe Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ Jami se va închide acum.</translation>
<source>Username already taken</source>
<translation>Nume ales deja</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sigur vrei să te înscrii în Jami fără nume de utilizator?
-Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caractere generat aleatoriu.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- maximum 32 de caractere
-- Caractere alfabetice (de la A la Z)
-- Caractere numerice (de la 0 la 9)
-- Caracter special autorizat: liniuță (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Encrypt</source>
<translation>Cifrează</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Acest cont este creat local</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Este recomandată alegerea unui nume de utilizator, care nu poate fi schimbat.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Cifrarea contului tău cu o parolă este opțională, iar aceasta nu poate fi recuperată.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Imaginea și pseudonimul sunt opționale și pot fi modificate în reglări.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Change current password</source>
<translation>Schimbă parola actuală</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Copie de rezervă a contului ca fișier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,28 +1551,11 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Customize profile</source>
<translation>Personalizează profilul</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Acest profil este împărtășit doar cu contactele acestui cont.
-Profilul poate fi modificat în orice moment în reglările contului.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Cifrează contul cu o parolă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un cont Jami este înregistrat doar în acest aparat ca o arhivă care conține cheile contului tău. Accesul la această arhivă poate fi protejat printr-o parolă.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Atenție, dacă pierzi parola, aceasta nu poate fi recuperată!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1588,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contacte blocate</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Chiar vrei să ștergi acest cont?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Dacă contul tău nu a fost asociat altui aparat și nu ai o copie de rezervă, va fi pierdut definitiv împreună cu numele înscris.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2053,11 +2103,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>Creează contul tău dintr-o copie de rezervă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Poți obține o arhivă făcând clic pe „Copie de rezervă a contului†în reglările contului. Asta va crea un fișier .gz în aparatul tău.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2148,16 +2193,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation>Alege contul de asociat</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Alege „Asociază alt aparatâ€</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Codul PIN va fi disponibil timp de 10 minute.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2218,11 +2253,6 @@ Please try again later.</source>
<source>Export</source>
<translation>Exportă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Alege o poză de profil</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2545,11 +2575,6 @@ Copiază-l și distribuie-l prietenilor!</translation>
<source>Welcome to</source>
<translation>Bine ai venit pe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Distribuie, în mod liber și privat, cu Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2741,26 +2766,11 @@ Copiază-l și distribuie-l prietenilor!</translation>
<source>Remove</source>
<translation>Elimină</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Transferul la tehnologia „Grup†va permite sincronizarea acestei conversații între mai multe aparate și va îmbunătăți calitatea. Cronologia conversațiilor vechi va fi ștearsă în acest proces.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Transferă conversația</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Chiar vrei să ștergi această conversație?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Chiar vrei să blochezi această conversație?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2916,26 +2926,11 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Dismiss</source>
<translation>Ignoră</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Adaugă o poză și un pseudonim pentru a-ți completa profilul</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Acest profil este distribuit doar contactelor acestui cont</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profilul tău este distribuit doar contactelor tale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>De ce ar trebui să-mi salvez contul?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3652,120 +3647,120 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>What does Jami mean?</source>
<translation>Ce înseamnă Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Alegerea numelui Jami a fost inspirată de cuvântul Swahili „jamiiâ€, care înseamnă comunitate ca substantiv È™i împreună ca adverb.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Ce este punctul verde de lângă contul meu?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un punct roșu înseamnă că acest cont este deconectat de la rețea, iar când este conectat devine verde.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>De ce ar trebui să fac o copie de rezervă a contului meu?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami este distribuit, iar contul tău este stocat doar în aparatul tău. Dacă pierzi parola sau datele tale, nu le poți recupera.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Pot face o teleconferință?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>În timpul unui apel, poți face clic pe „Adaugă participanți†pentru a adăuga un contact la apel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Are Jami discuții în grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>În reglări, poți activa grupurile (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Ce este un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un cont Jami este o cheie de cifrare asimetrică. Contul tău este identificat de un ID Jami, care este o amprentă a cheii tale publice.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Ce informații trebuie să furnizez pentru a crea un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Atunci când creezi un nou cont Jami, nu trebuie să furnizezi nicio informație privată, cum ar fi e-mailul, adresa sau numărul de telefon.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>De ce nu trebuie să folosesc o parolă?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Cu Jami, contul tău este stocat într-un dosar din aparatul tău. Parola este utilizată doar pentru a cifra contul tău, pentru a te proteja de cineva care are acces fizic la aparatul tău.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>De ce nu trebuie să înscriu un nume de utilizator?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Cel mai sigur identificator este ID-ul Jami, dar, deoarece acesta este dificil de utilizat pentru unele persoane, ai și opțiunea de a înscrie un nume de utilizator.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Cum pot face o copie de rezervă a contului meu?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>În reglările contului, este disponibil un buton pentru a face o copie de rezervă a contului.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>De ce nu trebuie să folosesc o parolă?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Ce se întâmplă dacă îmi șterg contul?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>De ce nu trebuie să înscriu un nume de utilizator?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Contul tău este stocat doar în aparatele tale. Dacă ștergi contul din fiecare aparat, contul dispare și nu îl mai poți recupera.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Cel mai sigur identificator este ID-ul Jami, dar, deoarece acesta este dificil de utilizat pentru unele persoane, ai și opțiunea de a înscrie un nume de utilizator.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Pot să-mi folosesc contul pe mai multe aparate?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Cum pot face o copie de rezervă a contului meu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Da, poți asocia contul tău din reglări sau poți importa copia de rezervă din alt aparat.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Ce se întâmplă dacă îmi șterg contul?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_ru.ts b/translations/lrc_ru.ts
index de3e830f7840010e74abc74ded49db9141718a39..a92b64fa7ed950cb6eb5312a5880c22ba8d6222c 100644
--- a/translations/lrc_ru.ts
+++ b/translations/lrc_ru.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,24 +758,144 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ ÑущеÑтвует только на Ñтом уÑтройÑтве. ЕÑли вы потерÑете уÑтройÑтво или удалите приложение, ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ будет удалена, поÑле чего воÑÑтановить её будет невозможно. Ð’Ñ‹ можете Ñоздать резервную копию учётной запиÑи ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸Ð»Ð¸ позднее.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Резервный аккаунт здеÑÑŒ</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Создайте резервную копию!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Создать резервную копию аккаунта</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -963,11 +1088,6 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Remove conversation</source>
<translation>Удалить диалог</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Confirm password</source>
<translation>Подтверждение паролÑ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Выберите пароль Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ¹ учетной запиÑи на Ñтом уÑтройÑтве. Учтите, что пароль воÑÑтановить нельзÑ.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>По желанию</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Username already taken</source>
<translation>Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ занÑто</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Изменить текущий пароль</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° в .gz файл</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Заблокированные контакты</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Ð’Ñ‹ дейÑтвительно хотите удалить Ñтот аккаунт?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>ЕÑли Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ учётной запиÑи не Ñоздана Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ, или Ñта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ не добавлена на другое уÑтройÑтво, то она, вмеÑте Ñ Ñ€ÐµÐ³Ð¸Ñтрационным именем, будет безвозвратно потерÑна.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>Создать аккаунт из резервной копии</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Ðрхив можно получить, нажав на кнопку «Резервное копирование учетной запиÑи» в наÑтройках аккаунта. Ð’ результате будет Ñоздан файл .gz на вашем уÑтройÑтве.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Please try again later.</source>
<source>Export</source>
<translation>ÐкÑпорт</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Выбрать изображение Ð´Ð»Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€ÐºÐ¸</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Добро пожаловать в</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Удалить</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ð’Ñ‹ дейÑтвительно хотите удалить Ñтой перепиÑку? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2911,26 +2926,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Отклонить</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Ваш профиль доÑтупен только вашим контактам</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3648,118 +3648,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ru_RU.ts b/translations/lrc_ru_RU.ts
index 6d2db547de9e410b92a62daa6e7fc04add611a85..0551787f7bf8cbb6cd7f483fb87c2718f579039b 100644
--- a/translations/lrc_ru_RU.ts
+++ b/translations/lrc_ru_RU.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ ÑущеÑтвует только на Ñтом уÑтройÑтве. ЕÑли вы потерÑете уÑтройÑтво или удалите приложение, ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ будет удалена, поÑле чего воÑÑтановить её будет невозможно. Ð’Ñ‹ можете Ñоздать резервную копию учётной запиÑи ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸Ð»Ð¸ позднее.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Резервный аккаунт здеÑÑŒ</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Создайте резервную копию!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°</translation>
+ <source>Back up account</source>
+ <translation>Создать резервную копию аккаунта</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Remove conversation</source>
<translation>Удалить диалог</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Confirm password</source>
<translation>Подтверждение паролÑ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Выберите пароль Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ¹ учетной запиÑи на Ñтом уÑтройÑтве. Учтите, что пароль воÑÑтановить нельзÑ.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>По желанию</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Username already taken</source>
<translation>Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ занÑто</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Изменить текущий пароль</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° в .gz файл</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Заблокированные контакты</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Ð’Ñ‹ дейÑтвительно хотите удалить Ñтот аккаунт?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>ЕÑли Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ учётной запиÑи не Ñоздана Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ, или Ñта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ не добавлена на другое уÑтройÑтво, то она, вмеÑте Ñ Ñ€ÐµÐ³Ð¸Ñтрационным именем, будет безвозвратно потерÑна.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>Создать аккаунт из резервной копии</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Ðрхив можно получить, нажав на кнопку «Резервное копирование учетной запиÑи» в наÑтройках аккаунта. Ð’ результате будет Ñоздан файл .gz на вашем уÑтройÑтве.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Please try again later.</source>
<source>Export</source>
<translation>ÐкÑпорт</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Выбрать изображение Ð´Ð»Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€ÐºÐ¸</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Добро пожаловать в</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Убрать</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ð’Ñ‹ дейÑтвительно хотите удалить Ñтой перепиÑку? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2911,26 +2926,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>СброÑить</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Ваш профиль доÑтупен только Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… контактов</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3648,118 +3648,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_si.ts b/translations/lrc_si.ts
index 184e8d000f18db828e03c6f63d40b2036ad84657..d32ca48d7701a324316bad465cfc3c80d98ea3f8 100644
--- a/translations/lrc_si.ts
+++ b/translations/lrc_si.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_sk.ts b/translations/lrc_sk.ts
index a276716f84c5a0f538fb07e0fbde4b0b07d05693..10e865d0094c54df7aaa827b85c0c1d65ce6acae 100644
--- a/translations/lrc_sk.ts
+++ b/translations/lrc_sk.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>ZálohovaÅ¥ váš úÄet</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>ZálohovaÅ¥ úÄet</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Odstrániť konverzáciu</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>PotvrÄte heslo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>PoužÃvateľské meno už je použité</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Blokované kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ SkopÃrujte ho a zdieľajte s priateľmi!</translation>
<source>Welcome to</source>
<translation>Vitajte v</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ SkopÃrujte ho a zdieľajte s priateľmi!</translation>
<source>Remove</source>
<translation>Odstrániť</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Naozaj chcete vymazať túto konverzáciu?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Odmietnuť</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Váš profil je zdieľaný iba s vašimi kontaktmi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_sk_SK.ts b/translations/lrc_sk_SK.ts
index b98a02e4919e1bd13269f535e4fc0fd6b22ac6d7..7a0f7ce2d4ce1b4294d7adb00c3e9494ae8e0b3a 100644
--- a/translations/lrc_sk_SK.ts
+++ b/translations/lrc_sk_SK.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,23 +757,143 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>ZálohovaÅ¥ váš úÄet</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>ZálohovaÅ¥ úÄet</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Odstrániť konverzáciu</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>PotvrÄte heslo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>PoužÃvateľské meno už je použité</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Blokované kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ SkopÃrujte ho a zdieľajte s priateľmi!</translation>
<source>Welcome to</source>
<translation>Vitajte v</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ SkopÃrujte ho a zdieľajte s priateľmi!</translation>
<source>Remove</source>
<translation>Odstrániť</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Naozaj chcete vymazať túto konverzáciu?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Odmietnuť</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Váš profil je zdieľaný iba s vašimi kontaktmi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_sl.ts b/translations/lrc_sl.ts
index 03c6cdf811ae4c84bc1734f936bacb11df17dd52..d9175cc52dc327473b13c01c638351a9774c8ebc 100644
--- a/translations/lrc_sl.ts
+++ b/translations/lrc_sl.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami je platforma za univerzalno komunikacijo za vsakogar, ki ima za temelj zasebnost in ki sloni na prosto distribuiranem omrežju.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,23 +758,143 @@ Jami se bo zdaj zaprl.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>VaÅ¡ raÄun obstaja le na tej napravi. ÄŒe boste napravo izgubili ali odstranili program, bo vaÅ¡ raÄun izbrisan in ga ne bo mogoÄe obnoviti. VaÅ¡ raÄun lahko varnostno kopirate zdaj ali kasneje.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Tu ustvari varnostno kopijo</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Ustvarite varnostno kopijo svojega raÄuna!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Varnostno kopiranje raÄuna</translation>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -963,11 +1088,6 @@ Jami se bo zdaj zaprl.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami se bo zdaj zaprl.</translation>
<source>Remove conversation</source>
<translation>Odstrani pogovor</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami se bo zdaj zaprl.</translation>
<source>Confirm password</source>
<translation>Potrdi geslo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Izberite geslo za Å¡ifriranje vaÅ¡ega raÄuna na tej napravi. UpoÅ¡tevajte, da gesla ni mogoÄe obnoviti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Izbirno</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Izberete lahko uporabniško ime, da bas bodo enostavno našli in dosegli v storitvi Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ Jami se bo zdaj zaprl.</translation>
<source>Username already taken</source>
<translation>Uporabniško ime je že oddano</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Ali ste prepriÄani, da se želite pridružiti Jami brez uporabniÅ¡kega imena?
-ÄŒe je odgovor pozitiven, bo temu raÄunu dodeljen samo nakljuÄno tvorjen 40-znakovni identifikator.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- vsaj 32 znakov;
-- znaki angleške abecede (A to Z);
-- Å¡tevke (0 - 9);
-- dodatni posebni znak: pomišljaj (-).</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation>Å ifriraj</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>RaÄun je ustvarjen krajevno</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Izbor uporabniÅ¡kega imena je priporoÄljiv in ga ni mogoÄe spremeniti</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Å ifriranje raÄuna z geslom je neobvezno in ga ni mogoÄe obnoviti</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Slika in vzdevek nista obvezna in ju je možno spremeniti v nastavitvah.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Spremeni obstojeÄe geslo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Varnostno kopiraj raÄun v datoteko .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,28 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation>Prilagodi profil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ta profil delite samo s stiki tega raÄuna.
-Profil lahko vedno spremenite prek nastavitev raÄuna.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Å ifrirajte svoj raÄun z geslom</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>RaÄun Jami je registriran samo na tej napravi kot arhiv, ki vsebuje kljuÄe za vaÅ¡ raÄun. Dostop do tega arhiva lahko zaÅ¡Äitite z geslom.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>UpoÅ¡tevajte, da ob izgubi gesla raÄuna ni mogoÄe obnoviti!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1588,16 +1648,6 @@ Poskusite znova kasneje.</translation>
<source>Banned contacts</source>
<translation>Zavrnjeni stiki</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Ali res želite izbrisati ta raÄun?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>ÄŒe vaÅ¡ raÄun ni bil varnostno shranjen ali dodan drugi napravi, bosta vaÅ¡ raÄun in uporabljeno ime nepovratno izgubljena.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2053,11 +2103,6 @@ Ali bi radi izvedli posodobitev?</translation>
<source>Create your account from a backup</source>
<translation>Ustvarite raÄun iz varnostne kopije</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Lahko ustvarite arhiv s klikom na "Varnostno kopiranje" na nastavitvah raÄuna. To bo na vaÅ¡i napravi ustvarilo .gz datoteko.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2148,16 +2193,6 @@ Ali bi radi izvedli posodobitev?</translation>
<source>Choose the account to link</source>
<translation>Izberite raÄun za povezovanje</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Izberite "Poveži drugo napravo"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Koda PIN bo na voljo 10 minut.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2218,11 +2253,6 @@ Ali bi radi izvedli posodobitev?</translation>
<source>Export</source>
<translation>Izvozi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Za avatar izberi sliko</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2545,11 +2575,6 @@ Kopirajte ga in delite s prijatelji!</translation>
<source>Welcome to</source>
<translation>Dobrodošli v</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Delite z drugimi, prosto in zasebno prek Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2741,26 +2766,11 @@ Kopirajte ga in delite s prijatelji!</translation>
<source>Remove</source>
<translation>Odstrani</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Migracija na tehnologijo jat (angl. swarm) bo omogoÄila usklajevanje tega pogovora na veÄ napravah in izboljÅ¡ala zanesljivost. Ob tem bo opuÅ¡Äena zgodovina pogovorov izbrisana.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migriraj pogovor</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ali res želite odstraniti ta pogovor?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Ali res želite blokirati ta pogovor?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2917,26 +2927,11 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>Dismiss</source>
<translation>Opusti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Dodajte sliko in vzdevek, da dokonÄate svoj profil</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Profil delite le s stiki tega raÄuna</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Vaš profil se deli samo z vašimi stiki</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Zakaj naj bi shranil/a svoj raÄun?</translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,120 +3648,120 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>What does Jami mean?</source>
<translation>Kaj pomeni Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Izbor imena Jami je navdihnila beseda v svahiliju, jamii, ki pomeni skupnost (kot samostalnik in skupaj kot prislov).</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Kaj pomeni zelena pika ob mojem raÄunu?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>RdeÄa pika pomeni, da vaÅ¡ raÄun ni povezan z omrežjem, v zeleno se spremeni, ko se poveže.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Zakaj naj bi varnostno kopiral/a svoj raÄun?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami je distribuiran in vaÅ¡ raÄun je shranjen samo na vaÅ¡i napravi. ÄŒe izgubite geslo ali svoje podatke, ga ne morete obnoviti.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Ali lahko opravim konferenÄne klice?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Sredi klica lahko kliknete "Dodaj udeležence" in tako dodate stik h klicu</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Ali ima Jami skupinske klepete?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>V nastavitvah lahko omogoÄite podporo za skupine (poskusno).</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Kaj je raÄun Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>RaÄun Jami je kljuÄ za asimetriÄno Å¡ifriranje. VaÅ¡ raÄun se identificira z ID Jami, ki je prstni odtis vaÅ¡ega javnega kljuÄa.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Katere podatke moram podati, da ustvarjanje raÄuna Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Ko ustvarite nov raÄun Jami, ni potrebno podati nobenih zasebnih podatkov, kot so e-naslov, naslov in telefonska Å¡tevilka.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Zakaj ne rabim uporabiti gesla?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Z Jami je vaÅ¡ raÄun shranjen v mapi na vaÅ¡i napravi. Geslo se uporablja le za Å¡ifriranje vaÅ¡ega raÄuna, da vas zaÅ¡Äiti pred drugimi, ki imajo fiziÄni dostop do vaÅ¡e naprave.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Zakaj ne rabim registrirati uporabniškega imena?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Najbolj trajen, varen identifikator je vaÅ¡ ID za Jami, a ker ta ni preveÄ prijazen do uporabnikov, imate tudi možnost registrirati uporabniÅ¡ko ime.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Kako lahko varnostno kopiram svoj raÄun?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>V nastavitvah raÄuna je na voljo gumb za varnostno kopiranje vaÅ¡ega raÄuna.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Zakaj ne rabim uporabiti gesla?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Kaj se zgodi, Äe izbriÅ¡em svoj raÄun?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Zakaj ne rabim registrirati uporabniškega imena?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>VaÅ¡ raÄun se hrani zgolj na vaÅ¡ih lastnih napravah. ÄŒe raÄun izbriÅ¡ete iz vseh naprav, je raÄun izginil in ga ne boste mogli dobiti nazaj.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Najbolj trajen, varen identifikator je vaÅ¡ ID za Jami, a ker ta ni preveÄ prijazen do uporabnikov, imate tudi možnost registrirati uporabniÅ¡ko ime.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Ali lahko uporabim svoj raÄun na veÄ napravah?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Kako lahko varnostno kopiram svoj raÄun?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Da, raÄun lahko povežete prek nastavitev ali pa lahko uvozite svojo varnostno kopijo na drugi napravi.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Kaj se zgodi, Äe izbriÅ¡em svoj raÄun?</translation>
</message>
</context>
<context>
diff --git a/translations/lrc_sq_AL.ts b/translations/lrc_sq_AL.ts
index 4d3d56243e9b9d984463e0bf0c28260fedecd975..db4a38832e6332ae7a5f847a4e9043cd930575ce 100644
--- a/translations/lrc_sq_AL.ts
+++ b/translations/lrc_sq_AL.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami është një platformë universale komunikimesh, me privatësinë si themel të vetin, që bazohet në një rrjet të shpërndarë për këdo.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,24 +758,144 @@ Jami tani do të mbyllet.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Llogaria juaj ekziston vetëm në këtë pajisje. Nëse humbni pajisjen ose çinstaloni aplikacionin, llogaria juaj do të fshihet dhe s’mund të rikthehet. Mund të bëni një kopjeruajtje të llogarisë tuaj tani ose më vonë.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Kopjeruajeni llogarinë këtu</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Kopjeruani llogarinë tuaj!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Kopjeruaje llogarinë</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -963,11 +1088,6 @@ Jami tani do të mbyllet.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami tani do të mbyllet.</translation>
<source>Remove conversation</source>
<translation>Hiqe bisedën</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami tani do të mbyllet.</translation>
<source>Confirm password</source>
<translation>Ripohoni fjalëkalimin</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Zgjidhni një fjalëkalim për të fshehtëzuar llogarinë tuaj në këtë pajisje. Mbani parasysh që fjalëkalimi s’mund të rikthehet.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opsionale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,24 +1426,6 @@ Jami tani do të mbyllet.</translation>
<source>Username already taken</source>
<translation>Emër përdoruesi tashmë i zënë</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Jeni i sigurt se doni të hyni në Jami pa një emër përdoruesi?
-Nëse po, kësaj llogarie do t’i përshoqërohet vetëm një identifikues i prodhuar kuturu prej 40 shenjash.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 shenja e shumta
-- Shenja alfabetike (A në Z)
-- Shenja numerike (0 në 9)
-- Shenjë speciale e autorizuar: vijë në mes (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1339,26 +1441,6 @@ Nëse po, kësaj llogarie do t’i përshoqërohet vetëm një identifikues i pr
<source>Encrypt</source>
<translation>Fshehtëzoje</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Kjo llogatri krijohet lokalisht</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Zgjedhja e një emri përdoruesi është e rekomanduar dhe s’mund të ndryshohet</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Fshehtëzimi i llogarisë tuaj me një fjalëkalim është opsional dhe s’mund të rimerret</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Fotoja dhe nofka janë opsionale dhe mund të ndryshohen që nga rregullimet</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1444,11 +1526,6 @@ Nëse po, kësaj llogarie do t’i përshoqërohet vetëm një identifikues i pr
<source>Change current password</source>
<translation>Ndryshoni fjalëkalimin e tanishëm</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Kopjeruajeni llogarinë në një kartelë .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1474,27 +1551,11 @@ Nëse po, kësaj llogarie do t’i përshoqërohet vetëm një identifikues i pr
<source>Customize profile</source>
<translation>Përshtatni profil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Fshehtëzojeni llogarinë tuaj me një fjalëkalim</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1587,16 +1648,6 @@ Ju lutemi, riprovoni më vonë.</translation>
<source>Banned contacts</source>
<translation>Kontakte të dëbuar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Doni vërtet të fshihet kjo llogari?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Nëse llogaria juaj s’është kopjeruajtur ose shtuar te një tjetër pajisje, llogari dhe emri që keni regjistruar do të humbë në mënyrë të pakthyeshme.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2052,11 +2103,6 @@ Ju lutemi, riprovoni më vonë.</translation>
<source>Create your account from a backup</source>
<translation>Krijojeni llogarinë tuaj nga një kopjeruajtje</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Një arkiv mund ta keni duke klikuar mbi “Kopjeruani llogariâ€, te rregullime llogarie. Kjo do të krijojë në pajisjen tuaj një kartelë .gz.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2147,16 +2193,6 @@ Ju lutemi, riprovoni më vonë.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2217,11 +2253,6 @@ Ju lutemi, riprovoni më vonë.</translation>
<source>Export</source>
<translation>Eksportoje</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Zgjidhni për avatar një foto</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2544,11 +2575,6 @@ Kopjojeni dhe jepuani shokëve!</translation>
<source>Welcome to</source>
<translation>Mirë se vini te</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2740,26 +2766,11 @@ Kopjojeni dhe jepuani shokëve!</translation>
<source>Remove</source>
<translation>Hiqe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Migrimi në teknologjinë Swarm do të lejojë njëkohësimin e kësaj bisede nëpër pajisje të shumta dhe do të përmirësojë funksionimin. Gjatë procesit do të spastrohet historiku i dikurshëm i bisedës.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation>Migroje bisedën</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Doni të hiqet vërtet kjo bisedë?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Doni të bllokoni vërtet këtë bisedë?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2916,26 +2927,11 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>Dismiss</source>
<translation>Hidhe Tej</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Shtoni një foto dhe një nofkë, që të plotësohet profili juaj</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profili juaj ndahet vetëm me kontaktet tuaja</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3653,118 +3649,118 @@ të lidhet, për njëkohësim të bisedës.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_sr.ts b/translations/lrc_sr.ts
index a4eb92a51afabc5236db8548ddbd0d85a0d0a753..9a9fc7cc00b9be9fc43e4dea19ee31a63fb0c077 100644
--- a/translations/lrc_sr.ts
+++ b/translations/lrc_sr.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opciono</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>KorisniÄko ime je zauzeto</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Otpusti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Vaš profile je podeljen samo sa Vašim kontaktima</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_sr@Cyrl.ts b/translations/lrc_sr@Cyrl.ts
index 4b106975d135c1f3016b55c58b4a9df85877c448..551626ff4c59f0a44299190493718f015ca965b1 100644
--- a/translations/lrc_sr@Cyrl.ts
+++ b/translations/lrc_sr@Cyrl.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opciono</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>KorisniÄko ime je zauzeto</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Otpusti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Vaš profile je podeljen samo sa Vašim kontaktima</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_sr_RS.ts b/translations/lrc_sr_RS.ts
index 44c7ae3739d3d460e2b058f310272fe0ca9e95cb..d9d5603e0c2e6c16b8c25cdca0f9defbf3f1b10c 100644
--- a/translations/lrc_sr_RS.ts
+++ b/translations/lrc_sr_RS.ts
@@ -158,6 +158,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,22 +759,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -964,11 +1089,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,21 +1392,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1307,20 +1427,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1336,26 +1442,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1441,11 +1527,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1471,27 +1552,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2047,11 +2102,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2142,16 +2192,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2212,11 +2252,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2907,26 +2922,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3644,118 +3644,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/lrc_sv.ts b/translations/lrc_sv.ts
index b5cf5449ad6e423c95d02e89056c9de265202ae9..6eef461f12c90b08f562df4da4c1d3047b04dedc 100644
--- a/translations/lrc_sv.ts
+++ b/translations/lrc_sv.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,24 +757,144 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ditt konto finns endast på denna enhet. Om du förlorar enheten eller avinstallerar appen kommer ditt konto raderas och kan inte återställas. Du kan säkerhetskopiera nu eller senare. </translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Säkerhetskopiera konto här</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Säkerhetskopiera ditt konto!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Säkerhetskopiera konto</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation>Ta bort konversationen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Bekräfta lösenord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Välj lösenord för att kryptera ditt konto på denna enhet. Notera att lösenordet inte kan återställas. </translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Valfri</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Användarnamnet finns redan</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Ändra nuvarande lösenord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Säkerhetskopiering till en .gz fil</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1582,16 +1647,6 @@ Försök igen senare. </translation>
<source>Banned contacts</source>
<translation>Bannlysta kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Vill du verkligen ta bort det här kontot?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Om ditt konto inte blivit säkerhetskopierat eller lagt till på annan enhet kommer ditt konto och ditt registrerade namn att oåterkalleligen vara förlorat. </translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2046,11 +2101,6 @@ Försök igen senare. </translation>
<source>Create your account from a backup</source>
<translation>Skapa konto från säkerhetskopia</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>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/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2141,16 +2191,6 @@ Försök igen senare. </translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2211,11 +2251,6 @@ Försök igen senare. </translation>
<source>Export</source>
<translation>Exportera</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Välj en bild som avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Kopiera och dela det med dina vänner!</translation>
<source>Welcome to</source>
<translation>Välkommen till</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Kopiera och dela det med dina vänner!</translation>
<source>Remove</source>
<translation>Ta bort</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Vill du verkligen ta bort den här konversationen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2910,26 +2925,11 @@ ansluter för att synkronisera konversationen. </translation>
<source>Dismiss</source>
<translation>Avfärda</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Din profil delas endast med dina kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3647,118 +3647,118 @@ ansluter för att synkronisera konversationen. </translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_sw.ts b/translations/lrc_sw.ts
index e98a3a21fb468185d3a4386a075e31f69ed9c388..af6483a41ad0134c32c625844f68d092f344b40b 100644
--- a/translations/lrc_sw.ts
+++ b/translations/lrc_sw.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_ta.ts b/translations/lrc_ta.ts
index 219182dd76fb88231ce1d323f90344826c88ec1e..0b75be2a372ad42ac179d8ad2ba973434420c8a7 100644
--- a/translations/lrc_ta.ts
+++ b/translations/lrc_ta.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_te.ts b/translations/lrc_te.ts
index b15474e45e47a5a09d6cd7882d173552b7e88013..f05d17ce01840500a7cb358322a13ac5264f641b 100644
--- a/translations/lrc_te.ts
+++ b/translations/lrc_te.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_th.ts b/translations/lrc_th.ts
index 36da3ce285015bb9277777711fdefd8110af4f05..5706c844980c8c70686d00f36f1cab3fafb8531a 100644
--- a/translations/lrc_th.ts
+++ b/translations/lrc_th.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_tr.ts b/translations/lrc_tr.ts
index c9f23b02d181ca23eed49e2aca0622594e1f0268..e8ac451a927d195699c9a7eff1cc00c98c065b4a 100644
--- a/translations/lrc_tr.ts
+++ b/translations/lrc_tr.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -753,24 +758,144 @@ Jami şimdi kapatılacak.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Hesabınız yalnızca bu cihazda bulunmaktadır. Cihazınızı kaybederseniz veya uygulamayı kaldırırsanız hesabınız silinir ve kurtarılamaz. Hesabınızı şimdi ya da daha sonra yedekleyebilirsiniz.</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Hesabı buraya yedekle</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Hesabını yedekle!</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>Hesabı yedekle</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -963,11 +1088,6 @@ Jami şimdi kapatılacak.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1014,6 +1134,16 @@ Jami şimdi kapatılacak.</translation>
<source>Remove conversation</source>
<translation>KonuÅŸma sil</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1261,21 +1391,11 @@ Jami şimdi kapatılacak.</translation>
<source>Confirm password</source>
<translation>Parolayı onayla</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Bu aygıttaki hesabınızı şifrelemek için parola seçin. Parolanız kurtarılamaz, not alın.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>İsteğe bağlı</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami şimdi kapatılacak.</translation>
<source>Username already taken</source>
<translation>Kullanıcı adı önceden alınmış</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1335,26 +1441,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Şimdiki parolayı değiştirin</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Hesabı bir .gz dosyasına yedekleyin</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1470,27 +1551,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Lütfen yeniden deneyin.</translation>
<source>Banned contacts</source>
<translation>EngellenmiÅŸ KiÅŸiler</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Gerçekten bu hesabı silmek istiyor musunuz?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Hesabınız yedeklenmediyse veya başka bir aygıta eklenmediyse, hesabınız ve kayıtlı adınız geri alınamaz bir şekilde kaybolacaktır.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2048,11 +2103,6 @@ Lütfen yeniden deneyin.</translation>
<source>Create your account from a backup</source>
<translation>Hesabınızı bir yedekten oluşturun</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Hesap ayarlarında "Hesabı yedekle"ye tıklayarak arşiv edinebilirsiniz. Bu, aygıtınızda bir .gz dosyası oluşturacak.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2143,16 +2193,6 @@ Lütfen yeniden deneyin.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2213,11 +2253,6 @@ Lütfen yeniden deneyin.</translation>
<source>Export</source>
<translation>Dışa aktar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Avatar olarak bir resim seçin</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2540,11 +2575,6 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
<source>Welcome to</source>
<translation>HoÅŸ Geldiniz</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2736,26 +2766,11 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
<source>Remove</source>
<translation>Kaldır</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Bu konuşmayı gerçekten silmek istiyor musun?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2912,26 +2927,11 @@ baÄŸlanana kadar bekleyin</translation>
<source>Dismiss</source>
<translation>Reddet</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profiliniz yalnızca kişilerinizle paylaşılır</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3649,118 +3649,118 @@ baÄŸlanana kadar bekleyin</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_tr_TR.ts b/translations/lrc_tr_TR.ts
index c250ce6fa4a50d468ef24502c361efe0811a266d..ecc6716be9d1e5a81b34a7d77eac86109e98fbcb 100644
--- a/translations/lrc_tr_TR.ts
+++ b/translations/lrc_tr_TR.ts
@@ -158,6 +158,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,22 +759,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -964,11 +1089,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,21 +1392,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1307,20 +1427,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1336,26 +1442,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1441,11 +1527,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1471,27 +1552,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2047,11 +2102,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2142,16 +2192,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2212,11 +2252,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2907,26 +2922,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3644,118 +3644,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/lrc_tt.ts b/translations/lrc_tt.ts
index ed644ccf7d324fcb9843c2b551a891016b16a0d9..64f9465226521521c28c72bba4f99a707f3b0606 100644
--- a/translations/lrc_tt.ts
+++ b/translations/lrc_tt.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_uk.ts b/translations/lrc_uk.ts
index 9728318b861d30c91e67b9ffc52bfc1a44af6fd8..22978d165e57eb3d8611e194e83db639b089a89f 100644
--- a/translations/lrc_uk.ts
+++ b/translations/lrc_uk.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation>Підтвердити пароль</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>За бажаннÑм</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача вже зайнÑто</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation>ЕкÑпортувати</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2537,11 +2572,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>Вітаємо у</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2733,26 +2763,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>Видалити</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2906,26 +2921,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation>Відхилити</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Ваш профіль бачитимуть лише ваші контакти</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3643,118 +3643,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_uk_UA.ts b/translations/lrc_uk_UA.ts
index 534f3bf794cc0637c0f307b1f24115881a597443..28f22f8af2ab836cbd60880fff4508d8f9a20545 100644
--- a/translations/lrc_uk_UA.ts
+++ b/translations/lrc_uk_UA.ts
@@ -158,6 +158,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -754,22 +759,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -964,11 +1089,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1015,6 +1135,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1262,21 +1392,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1307,20 +1427,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1336,26 +1442,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1441,11 +1527,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1471,27 +1552,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2047,11 +2102,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2142,16 +2192,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2212,11 +2252,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2538,11 +2573,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2734,26 +2764,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2907,26 +2922,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3644,118 +3644,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/lrc_vi.ts b/translations/lrc_vi.ts
index 941c87a1673e67066591d9d6fb2b19852b3036b8..4be60727b3f5b6ddd1693b2d376088c3b6c482b0 100644
--- a/translations/lrc_vi.ts
+++ b/translations/lrc_vi.ts
@@ -156,6 +156,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="48"/>
<location filename="../src/app/constant/JamiStrings.qml" line="708"/>
@@ -752,22 +757,142 @@ Jami will now quit.</source>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <source>Back up account here</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <source>Back up your account!</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -962,11 +1087,6 @@ Jami will now quit.</source>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
<location filename="../src/app/constant/JamiStrings.qml" line="524"/>
@@ -1013,6 +1133,16 @@ Jami will now quit.</source>
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1260,21 +1390,11 @@ Jami will now quit.</source>
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1305,20 +1425,6 @@ Jami will now quit.</source>
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1334,26 +1440,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1439,11 +1525,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1469,27 +1550,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1581,16 +1646,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -2045,11 +2100,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2140,16 +2190,6 @@ Please try again later.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2210,11 +2250,6 @@ Please try again later.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2536,11 +2571,6 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2732,26 +2762,11 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
<source>Write to %1</source>
@@ -2905,26 +2920,11 @@ connects to synchronize the conversation.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -3642,118 +3642,118 @@ connects to synchronize the conversation.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_zh.ts b/translations/lrc_zh.ts
index 99cdc27ea99f1c7a6384587ea40c26d1682a55f7..922420f21d31306852034ebaa462fc553d14c1f2 100644
--- a/translations/lrc_zh.ts
+++ b/translations/lrc_zh.ts
@@ -80,7 +80,7 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>æ£€æµ‹åˆ°æ— æ•ˆçš„æ¶ˆæ¯</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
@@ -154,6 +154,11 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="43"/>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
+ <translation>Jami 是通用的通信平å°ï¼Œä»¥éšç§ä¸ºåŸºç¡€ï¼Œä¾èµ–于自由的分布å¼ç½‘络，为æ¯ä¸€ä¸ªäººæœåŠ¡</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -178,7 +183,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation>Jami 是一个普é通信平å°ï¼Œå°Šé‡ç”¨æˆ·çš„自由与éšç§ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="58"/>
@@ -213,7 +218,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="68"/>
<source>Add to conversation</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ åˆ°å¯¹è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="69"/>
@@ -313,12 +318,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
<source>Certificate File (*.crt)</source>
- <translation type="unfinished"/>
+ <translation>è¯ä¹¦æ–‡ä»¶ (*.crt)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="93"/>
<source>Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</source>
- <translation type="unfinished"/>
+ <translation>音频文件 (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="96"/>
@@ -443,7 +448,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="124"/>
<source>Key File (*.key)</source>
- <translation type="unfinished"/>
+ <translation>密钥文件 (*.key)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="127"/>
@@ -753,23 +758,143 @@ Jami 将立å³é€€å‡ºã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>本账户仅å˜åœ¨äºŽæ¤è®¾å¤‡ä¸Šã€‚如果您丢失了该设备或å¸è½½äº†æœ¬åº”ç”¨ï¼Œé‚£ä¹ˆæ‚¨çš„è´¦æˆ·ä¹Ÿä¼šè¢«åˆ é™¤å¹¶ä¸”æ— æ³•æ¢å¤ã€‚您å¯çŽ°åœ¨æˆ–ç¨åŽå¤‡ä»½æ‚¨çš„账户。</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>在æ¤å¤‡ä»½è´¦æˆ·</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>備份您的帳號ï¼</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>备份账户</translation>
+ <source>Back up account</source>
+ <translation>备份å¸æˆ·</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -799,12 +924,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
- <translation type="unfinished"/>
+ <translation>Jami 归档文件 (*.gz)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="219"/>
<source>All files (*)</source>
- <translation type="unfinished"/>
+ <translation>所有文件 (*)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="222"/>
@@ -866,12 +991,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="236"/>
<source>Mute camera</source>
- <translation type="unfinished"/>
+ <translation>æ‘„åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="237"/>
<source>Unmute camera</source>
- <translation type="unfinished"/>
+ <translation>å–消摄åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="238"/>
@@ -951,22 +1076,17 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>在æ—è¾¹</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>在顶部</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>éšè—自己</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1007,13 +1127,23 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="268"/>
<source>Confirm action</source>
- <translation type="unfinished"/>
+ <translation>确认æ“作</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="269"/>
<source>Remove conversation</source>
<translation>移除会è¯</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1032,7 +1162,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="275"/>
<source>Conversation details</source>
- <translation type="unfinished"/>
+ <translation>对è¯è¯¦æƒ…</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="278"/>
@@ -1127,7 +1257,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>布局设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>这是æ¥è‡ªåŽç«¯çš„错误：%0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1187,7 +1317,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="314"/>
<source>Enter the Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>输入 Jami å¸å·ç®¡ç†æœåŠ¡å™¨ï¼ˆJAMS）的 URL</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="315"/>
@@ -1202,7 +1332,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="317"/>
<source>Enter JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>输入 JAMS å‡æ®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="318"/>
@@ -1233,17 +1363,17 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="325"/>
<source>Choose a username</source>
- <translation type="unfinished"/>
+ <translation>选择一个用户å</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="326"/>
<source>Choose an identifier</source>
- <translation type="unfinished"/>
+ <translation>é€‰æ‹©ä¸€ä¸ªæ ‡è¯†ç¬¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="327"/>
<source>The identifier is not available</source>
- <translation type="unfinished"/>
+ <translation>è¯¥æ ‡è¯†ç¬¦ä¸å¯ç”¨</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="328"/>
@@ -1261,21 +1391,11 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<source>Confirm password</source>
<translation>确认密ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>创建密ç æ¥åŠ 密æ¤è®¾å¤‡ä¸Šçš„账户。请注æ„密ç æ— æ³•æ¢å¤ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>å¯é€‰</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<source>Username already taken</source>
<translation>å·²å–得的使用者å稱</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1328,37 +1434,17 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="347"/>
<source>Local</source>
- <translation type="unfinished"/>
+ <translation>本地的</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="348"/>
<source>Encrypt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
+ <translation>åŠ å¯†</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
- <translation type="unfinished"/>
+ <translation>SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="357"/>
@@ -1383,7 +1469,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="361"/>
<source>Personalize account</source>
- <translation type="unfinished"/>
+ <translation>个性化账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="362"/>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>更改当å‰å¯†ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>备份账户到 .gz 文件</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1463,38 +1544,22 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
<source>Advanced account settings</source>
- <translation type="unfinished"/>
+ <translation>高级账户设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="381"/>
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
+ <translation>使用密ç åŠ å¯†æ‚¨çš„è´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
- <translation type="unfinished"/>
+ <translation>输入昵称ã€å§“æ°ã€â€¦â€¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="389"/>
@@ -1571,7 +1636,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="409"/>
<source>Banned</source>
- <translation type="unfinished"/>
+ <translation>å·²å±è”½</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="410"/>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>å·²å±è”½çš„è”系人</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>您确定è¦åˆ 除æ¤è´¦æˆ·å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>å¦‚æžœæ‚¨çš„è´¦æˆ·å°šæœªå¤‡ä»½æˆ–æ·»åŠ åˆ°å…¶ä»–è®¾å¤‡ï¼Œæ‚¨çš„è´¦æˆ·å’Œå·²æ³¨å†Œå称将ä¸å¯æŒ½å›žåœ°ä¸¢å¤±ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1671,7 +1726,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="435"/>
<source>Text zoom</source>
- <translation type="unfinished"/>
+ <translation>æ–‡å—缩放</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="438"/>
@@ -1855,7 +1910,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="486"/>
<source>This feature is in development.</source>
- <translation type="unfinished"/>
+ <translation>æ¤åŠŸèƒ½æ£åœ¨å¼€å‘ä¸ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="489"/>
@@ -1890,7 +1945,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="497"/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"/>
+ <translation>键盘快æ·é”®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="499"/>
@@ -2048,11 +2103,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>从备份创建您的账户</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>您å¯åœ¨è´¦æˆ·è®¾ç½®ä¸ç‚¹å‡»â€œå¯¼å‡ºè´¦æˆ·â€èŽ·å¾—归档。这会在您的设备上创建一个以 .gz 结尾的文件。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2076,12 +2126,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="542"/>
<source>Import a Jami account from an archive file on this device.</source>
- <translation type="unfinished"/>
+ <translation>从设备上的账户档案文件导入 Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="543"/>
<source>Select archive file</source>
- <translation type="unfinished"/>
+ <translation>选择归档文件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="546"/>
@@ -2111,7 +2161,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="552"/>
<source>A PIN is required to use an existing Jami account on this device.</source>
- <translation type="unfinished"/>
+ <translation>éœ€è¦ PIN ç 以在æ¤è®¾å¤‡ä¸Šä½¿ç”¨çŽ°æœ‰çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="553"/>
@@ -2126,12 +2176,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="555"/>
<source>Step 3</source>
- <translation type="unfinished"/>
+ <translation>第3æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="556"/>
<source>Step 4</source>
- <translation type="unfinished"/>
+ <translation>第4æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="557"/>
@@ -2141,17 +2191,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="558"/>
<source>Choose the account to link</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
+ <translation>选择è¦è¿žæŽ¥çš„账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
@@ -2166,7 +2206,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="566"/>
<source>Enter account's password</source>
- <translation type="unfinished"/>
+ <translation>输入账户密ç </translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="567"/>
@@ -2213,11 +2253,6 @@ Please try again later.</source>
<source>Export</source>
<translation>輸出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>选择图片作为头åƒ</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2241,7 +2276,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="585"/>
<source>Image Files (*.png *.jpg *.jpeg)</source>
- <translation type="unfinished"/>
+ <translation>图åƒæ–‡ä»¶ (*.png *.jpg *.jpeg)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="588"/>
@@ -2266,7 +2301,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="592"/>
<source>Reset Preferences</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å好设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="593"/>
@@ -2286,12 +2321,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="596"/>
<source>Are you sure you wish to reset %1 preferences?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦é‡ç½®%1å好设置å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="597"/>
<source>Are you sure you wish to uninstall %1?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦å¸è½½ %1 å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
@@ -2326,12 +2361,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="604"/>
<source>Display or hide General plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—通用æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="605"/>
<source>Display or hide Account plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—账户æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="606"/>
@@ -2341,7 +2376,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="607"/>
<source>Plugin Files (*.jpl)</source>
- <translation type="unfinished"/>
+ <translation>æ’件文件 (*.jpl)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="608"/>
@@ -2351,7 +2386,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="609"/>
<source>Select An Image to %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 选择图片</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="610"/>
@@ -2366,7 +2401,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="612"/>
<source>Choose Plugin</source>
- <translation type="unfinished"/>
+ <translation>选择æ’件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="615"/>
@@ -2436,7 +2471,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="632"/>
<source>Screen %1</source>
- <translation type="unfinished"/>
+ <translation>å±å¹• %1</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="635"/>
@@ -2468,7 +2503,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="644"/>
<source>Import from an archive backup</source>
- <translation type="unfinished"/>
+ <translation>从归档备份导入</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="645"/>
@@ -2498,7 +2533,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="650"/>
<source>Configure a SIP account</source>
- <translation type="unfinished"/>
+ <translation>é…ç½® SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="651"/>
@@ -2518,7 +2553,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="654"/>
<source>Join Jami</source>
- <translation type="unfinished"/>
+ <translation>åŠ å…¥ Jami</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="655"/>
@@ -2540,20 +2575,15 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>欢迎æ¥åˆ°</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
- <translation type="unfinished"/>
+ <translation>我已ç»æœ‰ä¸€ä¸ªè´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="661"/>
<source>Use existing Jami account</source>
- <translation type="unfinished"/>
+ <translation>使用现å˜çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="662"/>
@@ -2563,12 +2593,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="663"/>
<source>Share this Jami identifier to be contacted on this account!</source>
- <translation type="unfinished"/>
+ <translation>åˆ†äº«æ¤ Jami æ ‡è¯†ç¬¦ï¼Œæ¥ä¸Žè¿™ä¸ªè´¦æˆ·é€šè®¯ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="664"/>
<source>Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!</source>
- <translation type="unfinished"/>
+ <translation>è¿™é‡Œæ˜¯ä½ çš„ Jami æ ‡è¯†ç¬¦ã€‚ä¸è¦çŠ¹è±«ï¼Œåˆ†äº«å®ƒï¼Œè®©é€šè®¯æ›´æ–¹ä¾¿ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="667"/>
@@ -2736,25 +2766,10 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>åˆ é™¤</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>您真的è¦åˆ 除æ¤ä¼šè¯å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
+ <translation>转移对è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
@@ -2795,17 +2810,17 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="732"/>
<source>%1 Members</source>
- <translation type="unfinished"/>
+ <translation>%1 个æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="733"/>
<source>Member</source>
- <translation type="unfinished"/>
+ <translation>æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="734"/>
<source>Documents</source>
- <translation type="unfinished"/>
+ <translation>文档</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="735"/>
@@ -2815,7 +2830,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="736"/>
<source>Add a description</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ æè¿°</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="738"/>
@@ -2825,12 +2840,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="739"/>
<source>Ignore all notifications from this conversation</source>
- <translation type="unfinished"/>
+ <translation>忽略æ¥è‡ªæ¤å¯¹è¯çš„所有æ醒</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="740"/>
<source>Choose a color</source>
- <translation type="unfinished"/>
+ <translation>选择一个颜色</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="741"/>
@@ -2840,7 +2855,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="742"/>
<source>Leave</source>
- <translation type="unfinished"/>
+ <translation>离开</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="743"/>
@@ -2865,7 +2880,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="749"/>
<source>Go to conversation</source>
- <translation type="unfinished"/>
+ <translation>å‰å¾€ä¼šè¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="750"/>
@@ -2875,63 +2890,48 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="751"/>
<source>Kick member</source>
- <translation type="unfinished"/>
+ <translation>踢出æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="752"/>
<source>Administrator</source>
- <translation type="unfinished"/>
+ <translation>管ç†å‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="753"/>
<source>Invited</source>
- <translation type="unfinished"/>
+ <translation>已邀请</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="754"/>
<source>Remove member</source>
- <translation type="unfinished"/>
+ <translation>移除æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="755"/>
<source>To:</source>
- <translation type="unfinished"/>
+ <translation>至：</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="758"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="759"/>
<source>Tips</source>
- <translation type="unfinished"/>
+ <translation>æ示</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="760"/>
<source>Dismiss</source>
<translation>解散</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>您的账户资料仅会与您的è”系人分享</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -2973,17 +2973,17 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="69"/>
<source>Increase font size</source>
- <translation type="unfinished"/>
+ <translation>å¢žåŠ å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="73"/>
<source>Decrease font size</source>
- <translation type="unfinished"/>
+ <translation>å‡å°‘å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="77"/>
<source>Reset font size</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="86"/>
@@ -3641,126 +3641,126 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/tipsmodel.cpp" line="25"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="27"/>
<source>What does Jami mean?</source>
- <translation type="unfinished"/>
+ <translation>Jami 有何å«ä¹‰ï¼Ÿ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_zh_CN.ts b/translations/lrc_zh_CN.ts
index aa23846f8a4caf818b28465b0e1b4428b6808435..271cf0fcc5e108977f5443b8f21fbb7ae0ccf249 100644
--- a/translations/lrc_zh_CN.ts
+++ b/translations/lrc_zh_CN.ts
@@ -80,7 +80,7 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>æ£€æµ‹åˆ°æ— æ•ˆçš„æ¶ˆæ¯</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
@@ -154,6 +154,11 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="43"/>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
+ <translation>Jami 是一个普é通信平å°ï¼Œä»¥éšç§ä¸ºåŸºç¡€ï¼Œä¾èµ–于自由的分布å¼ç½‘络，为æ¯ä¸€ä¸ªäººæœåŠ¡</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -178,7 +183,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation>Jami 是一个普é通信平å°ï¼Œå°Šé‡ç”¨æˆ·çš„自由与éšç§ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="58"/>
@@ -213,7 +218,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="68"/>
<source>Add to conversation</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ åˆ°å¯¹è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="69"/>
@@ -313,12 +318,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
<source>Certificate File (*.crt)</source>
- <translation type="unfinished"/>
+ <translation>è¯ä¹¦æ–‡ä»¶ (*.crt)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="93"/>
<source>Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</source>
- <translation type="unfinished"/>
+ <translation>音频文件 (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="96"/>
@@ -443,7 +448,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="124"/>
<source>Key File (*.key)</source>
- <translation type="unfinished"/>
+ <translation>密钥文件 (*.key)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="127"/>
@@ -753,23 +758,143 @@ Jami 将立å³é€€å‡ºã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>本账户仅å˜åœ¨äºŽæ¤è®¾å¤‡ä¸Šã€‚如果您丢失了该设备或å¸è½½äº†æœ¬åº”ç”¨ï¼Œé‚£ä¹ˆæ‚¨çš„è´¦æˆ·ä¹Ÿä¼šè¢«åˆ é™¤å¹¶ä¸”æ— æ³•æ¢å¤ã€‚您å¯çŽ°åœ¨æˆ–ç¨åŽå¤‡ä»½æ‚¨çš„账户。</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>在æ¤å¤‡ä»½è´¦æˆ·</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>备份您的账户ï¼</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>备份账户</translation>
+ <source>Back up account</source>
+ <translation>备份å¸æˆ·</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -799,12 +924,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
- <translation type="unfinished"/>
+ <translation>Jami 归档文件 (*.gz)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="219"/>
<source>All files (*)</source>
- <translation type="unfinished"/>
+ <translation>所有文件 (*)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="222"/>
@@ -866,12 +991,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="236"/>
<source>Mute camera</source>
- <translation type="unfinished"/>
+ <translation>æ‘„åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="237"/>
<source>Unmute camera</source>
- <translation type="unfinished"/>
+ <translation>å–消摄åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="238"/>
@@ -951,22 +1076,17 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>在æ—è¾¹</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>在顶部</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>éšè—自己</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1007,13 +1127,23 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="268"/>
<source>Confirm action</source>
- <translation type="unfinished"/>
+ <translation>确认æ“作</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="269"/>
<source>Remove conversation</source>
<translation>移除会è¯</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1032,7 +1162,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="275"/>
<source>Conversation details</source>
- <translation type="unfinished"/>
+ <translation>对è¯è¯¦æƒ…</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="278"/>
@@ -1127,7 +1257,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>布局设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>这是æ¥è‡ªåŽç«¯çš„错误：%0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1187,7 +1317,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="314"/>
<source>Enter the Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>输入 Jami å¸å·ç®¡ç†æœåŠ¡å™¨ï¼ˆJAMS）的 URL</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="315"/>
@@ -1202,7 +1332,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="317"/>
<source>Enter JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>输入 JAMS å‡æ®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="318"/>
@@ -1233,17 +1363,17 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="325"/>
<source>Choose a username</source>
- <translation type="unfinished"/>
+ <translation>选择一个用户å</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="326"/>
<source>Choose an identifier</source>
- <translation type="unfinished"/>
+ <translation>é€‰æ‹©ä¸€ä¸ªæ ‡è¯†ç¬¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="327"/>
<source>The identifier is not available</source>
- <translation type="unfinished"/>
+ <translation>è¯¥æ ‡è¯†ç¬¦ä¸å¯ç”¨</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="328"/>
@@ -1261,21 +1391,11 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<source>Confirm password</source>
<translation>确认密ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>创建密ç æ¥åŠ 密æ¤è®¾å¤‡ä¸Šçš„账户。请注æ„密ç æ— æ³•æ¢å¤ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>å¯é€‰</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<source>Username already taken</source>
<translation>用户å已被å 用</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1328,37 +1434,17 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="347"/>
<source>Local</source>
- <translation type="unfinished"/>
+ <translation>本地的</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="348"/>
<source>Encrypt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
+ <translation>åŠ å¯†</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
- <translation type="unfinished"/>
+ <translation>SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="357"/>
@@ -1383,7 +1469,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="361"/>
<source>Personalize account</source>
- <translation type="unfinished"/>
+ <translation>个性化账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="362"/>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>更改当å‰å¯†ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>备份账户到 .gz 文件</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1463,38 +1544,22 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
<source>Advanced account settings</source>
- <translation type="unfinished"/>
+ <translation>高级账户设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="381"/>
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
+ <translation>使用密ç åŠ å¯†æ‚¨çš„è´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
- <translation type="unfinished"/>
+ <translation>输入昵称ã€å§“æ°ã€â€¦â€¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="389"/>
@@ -1571,7 +1636,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="409"/>
<source>Banned</source>
- <translation type="unfinished"/>
+ <translation>å·²å±è”½</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="410"/>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>å·²å±è”½çš„è”系人</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>您确定è¦åˆ 除æ¤è´¦æˆ·å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>å¦‚æžœæ‚¨çš„è´¦æˆ·å°šæœªå¤‡ä»½æˆ–æ·»åŠ åˆ°å…¶ä»–è®¾å¤‡ï¼Œæ‚¨çš„è´¦æˆ·å’Œå·²æ³¨å†Œå称将ä¸å¯æŒ½å›žåœ°ä¸¢å¤±ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1671,7 +1726,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="435"/>
<source>Text zoom</source>
- <translation type="unfinished"/>
+ <translation>æ–‡å—缩放</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="438"/>
@@ -1855,7 +1910,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="486"/>
<source>This feature is in development.</source>
- <translation type="unfinished"/>
+ <translation>æ¤åŠŸèƒ½æ£åœ¨å¼€å‘ä¸ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="489"/>
@@ -1890,7 +1945,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="497"/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"/>
+ <translation>键盘快æ·é”®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="499"/>
@@ -2048,11 +2103,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>从备份创建您的账户</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>您å¯åœ¨è´¦æˆ·è®¾ç½®ä¸ç‚¹å‡»â€œå¯¼å‡ºè´¦æˆ·â€èŽ·å¾—归档。这会在您的设备上创建一个以 .gz 结尾的文件。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2076,12 +2126,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="542"/>
<source>Import a Jami account from an archive file on this device.</source>
- <translation type="unfinished"/>
+ <translation>从设备上的账户档案文件导入 Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="543"/>
<source>Select archive file</source>
- <translation type="unfinished"/>
+ <translation>选择归档文件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="546"/>
@@ -2111,7 +2161,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="552"/>
<source>A PIN is required to use an existing Jami account on this device.</source>
- <translation type="unfinished"/>
+ <translation>éœ€è¦ PIN ç 以在æ¤è®¾å¤‡ä¸Šä½¿ç”¨çŽ°æœ‰çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="553"/>
@@ -2126,12 +2176,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="555"/>
<source>Step 3</source>
- <translation type="unfinished"/>
+ <translation>第3æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="556"/>
<source>Step 4</source>
- <translation type="unfinished"/>
+ <translation>第4æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="557"/>
@@ -2141,17 +2191,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="558"/>
<source>Choose the account to link</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
+ <translation>选择è¦è¿žæŽ¥çš„账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
@@ -2166,7 +2206,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="566"/>
<source>Enter account's password</source>
- <translation type="unfinished"/>
+ <translation>输入账户密ç </translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="567"/>
@@ -2213,11 +2253,6 @@ Please try again later.</source>
<source>Export</source>
<translation>导出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>选择图片作为头åƒ</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2241,7 +2276,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="585"/>
<source>Image Files (*.png *.jpg *.jpeg)</source>
- <translation type="unfinished"/>
+ <translation>图åƒæ–‡ä»¶ (*.png *.jpg *.jpeg)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="588"/>
@@ -2266,7 +2301,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="592"/>
<source>Reset Preferences</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å好设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="593"/>
@@ -2286,12 +2321,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="596"/>
<source>Are you sure you wish to reset %1 preferences?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦é‡ç½®%1å好设置å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="597"/>
<source>Are you sure you wish to uninstall %1?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦å¸è½½ %1 å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
@@ -2326,12 +2361,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="604"/>
<source>Display or hide General plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—通用æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="605"/>
<source>Display or hide Account plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—账户æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="606"/>
@@ -2341,7 +2376,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="607"/>
<source>Plugin Files (*.jpl)</source>
- <translation type="unfinished"/>
+ <translation>æ’件文件 (*.jpl)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="608"/>
@@ -2351,7 +2386,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="609"/>
<source>Select An Image to %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 选择图片</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="610"/>
@@ -2366,7 +2401,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="612"/>
<source>Choose Plugin</source>
- <translation type="unfinished"/>
+ <translation>选择æ’件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="615"/>
@@ -2436,7 +2471,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="632"/>
<source>Screen %1</source>
- <translation type="unfinished"/>
+ <translation>å±å¹• %1</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="635"/>
@@ -2468,7 +2503,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="644"/>
<source>Import from an archive backup</source>
- <translation type="unfinished"/>
+ <translation>从归档备份导入</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="645"/>
@@ -2498,7 +2533,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="650"/>
<source>Configure a SIP account</source>
- <translation type="unfinished"/>
+ <translation>é…ç½® SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="651"/>
@@ -2518,7 +2553,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="654"/>
<source>Join Jami</source>
- <translation type="unfinished"/>
+ <translation>åŠ å…¥ Jami</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="655"/>
@@ -2540,20 +2575,15 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>欢迎æ¥åˆ°</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
- <translation type="unfinished"/>
+ <translation>我已ç»æœ‰ä¸€ä¸ªè´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="661"/>
<source>Use existing Jami account</source>
- <translation type="unfinished"/>
+ <translation>使用现å˜çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="662"/>
@@ -2563,12 +2593,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="663"/>
<source>Share this Jami identifier to be contacted on this account!</source>
- <translation type="unfinished"/>
+ <translation>åˆ†äº«æ¤ Jami æ ‡è¯†ç¬¦ï¼Œæ¥ä¸Žè¿™ä¸ªè´¦æˆ·é€šè®¯ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="664"/>
<source>Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!</source>
- <translation type="unfinished"/>
+ <translation>è¿™é‡Œæ˜¯ä½ çš„ Jami æ ‡è¯†ç¬¦ã€‚ä¸è¦çŠ¹è±«ï¼Œåˆ†äº«å®ƒï¼Œè®©é€šè®¯æ›´æ–¹ä¾¿ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="667"/>
@@ -2736,25 +2766,10 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>åˆ é™¤</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>您真的è¦åˆ 除æ¤ä¼šè¯å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
+ <translation>转移对è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
@@ -2795,17 +2810,17 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="732"/>
<source>%1 Members</source>
- <translation type="unfinished"/>
+ <translation>%1 个æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="733"/>
<source>Member</source>
- <translation type="unfinished"/>
+ <translation>æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="734"/>
<source>Documents</source>
- <translation type="unfinished"/>
+ <translation>文档</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="735"/>
@@ -2815,7 +2830,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="736"/>
<source>Add a description</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ æè¿°</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="738"/>
@@ -2825,12 +2840,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="739"/>
<source>Ignore all notifications from this conversation</source>
- <translation type="unfinished"/>
+ <translation>忽略æ¥è‡ªæ¤å¯¹è¯çš„所有æ醒</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="740"/>
<source>Choose a color</source>
- <translation type="unfinished"/>
+ <translation>选择颜色</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="741"/>
@@ -2840,7 +2855,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="742"/>
<source>Leave</source>
- <translation type="unfinished"/>
+ <translation>离开</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="743"/>
@@ -2865,7 +2880,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="749"/>
<source>Go to conversation</source>
- <translation type="unfinished"/>
+ <translation>å‰å¾€ä¼šè¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="750"/>
@@ -2875,63 +2890,48 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="751"/>
<source>Kick member</source>
- <translation type="unfinished"/>
+ <translation>踢出æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="752"/>
<source>Administrator</source>
- <translation type="unfinished"/>
+ <translation>管ç†å‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="753"/>
<source>Invited</source>
- <translation type="unfinished"/>
+ <translation>已邀请</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="754"/>
<source>Remove member</source>
- <translation type="unfinished"/>
+ <translation>移除æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="755"/>
<source>To:</source>
- <translation type="unfinished"/>
+ <translation>至：</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="758"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="759"/>
<source>Tips</source>
- <translation type="unfinished"/>
+ <translation>æ示</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="760"/>
<source>Dismiss</source>
<translation>解散</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>您的账户资料仅会与您的è”系人分享</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -2973,17 +2973,17 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="69"/>
<source>Increase font size</source>
- <translation type="unfinished"/>
+ <translation>å¢žåŠ å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="73"/>
<source>Decrease font size</source>
- <translation type="unfinished"/>
+ <translation>å‡å°‘å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="77"/>
<source>Reset font size</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="86"/>
@@ -3641,126 +3641,126 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/tipsmodel.cpp" line="25"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="27"/>
<source>What does Jami mean?</source>
- <translation type="unfinished"/>
+ <translation>Jami 有何å«ä¹‰ï¼Ÿ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_zh_HK.ts b/translations/lrc_zh_HK.ts
index ab084f853ad992cc25a5309e864464060c7d7ce6..0a6ec7d1540bedf3b9b385876f53223b51204334 100644
--- a/translations/lrc_zh_HK.ts
+++ b/translations/lrc_zh_HK.ts
@@ -80,7 +80,7 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>æ£€æµ‹åˆ°æ— æ•ˆçš„æ¶ˆæ¯</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
@@ -154,6 +154,11 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="43"/>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
+ <translation>Jami 是通用的通信平å°ï¼Œä»¥éšç§ä¸ºåŸºç¡€ï¼Œä¾èµ–于自由的分布å¼ç½‘络，为æ¯ä¸€ä¸ªäººæœåŠ¡</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -178,7 +183,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation>Jami 是一个普é通信平å°ï¼Œå°Šé‡ç”¨æˆ·çš„自由与éšç§ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="58"/>
@@ -213,7 +218,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="68"/>
<source>Add to conversation</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ åˆ°å¯¹è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="69"/>
@@ -313,12 +318,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
<source>Certificate File (*.crt)</source>
- <translation type="unfinished"/>
+ <translation>è¯ä¹¦æ–‡ä»¶ (*.crt)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="93"/>
<source>Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</source>
- <translation type="unfinished"/>
+ <translation>音频文件 (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="96"/>
@@ -443,7 +448,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="124"/>
<source>Key File (*.key)</source>
- <translation type="unfinished"/>
+ <translation>密钥文件 (*.key)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="127"/>
@@ -753,23 +758,143 @@ Jami 将立å³é€€å‡ºã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>本账户仅å˜åœ¨äºŽæ¤è®¾å¤‡ä¸Šã€‚如果您丢失了该设备或å¸è½½äº†æœ¬åº”ç”¨ï¼Œé‚£ä¹ˆæ‚¨çš„è´¦æˆ·ä¹Ÿä¼šè¢«åˆ é™¤å¹¶ä¸”æ— æ³•æ¢å¤ã€‚您å¯çŽ°åœ¨æˆ–ç¨åŽå¤‡ä»½æ‚¨çš„账户。</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>在æ¤å¤‡ä»½è´¦æˆ·</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>備份您的帳號ï¼</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>备份账户</translation>
+ <source>Back up account</source>
+ <translation>备份å¸æˆ·</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -799,12 +924,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
- <translation type="unfinished"/>
+ <translation>Jami 归档文件 (*.gz)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="219"/>
<source>All files (*)</source>
- <translation type="unfinished"/>
+ <translation>所有文件 (*)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="222"/>
@@ -866,12 +991,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="236"/>
<source>Mute camera</source>
- <translation type="unfinished"/>
+ <translation>æ‘„åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="237"/>
<source>Unmute camera</source>
- <translation type="unfinished"/>
+ <translation>å–消摄åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="238"/>
@@ -951,22 +1076,17 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>在æ—è¾¹</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>在顶部</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>éšè—自己</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1007,13 +1127,23 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="268"/>
<source>Confirm action</source>
- <translation type="unfinished"/>
+ <translation>确认æ“作</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="269"/>
<source>Remove conversation</source>
<translation>移除会è¯</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1032,7 +1162,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="275"/>
<source>Conversation details</source>
- <translation type="unfinished"/>
+ <translation>对è¯è¯¦æƒ…</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="278"/>
@@ -1127,7 +1257,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>布局设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>这是æ¥è‡ªåŽç«¯çš„错误：%0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1187,7 +1317,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="314"/>
<source>Enter the Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>输入 Jami å¸å·ç®¡ç†æœåŠ¡å™¨ï¼ˆJAMS）的 URL</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="315"/>
@@ -1202,7 +1332,7 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="317"/>
<source>Enter JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>输入 JAMS å‡æ®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="318"/>
@@ -1233,17 +1363,17 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="325"/>
<source>Choose a username</source>
- <translation type="unfinished"/>
+ <translation>选择一个用户å</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="326"/>
<source>Choose an identifier</source>
- <translation type="unfinished"/>
+ <translation>é€‰æ‹©ä¸€ä¸ªæ ‡è¯†ç¬¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="327"/>
<source>The identifier is not available</source>
- <translation type="unfinished"/>
+ <translation>è¯¥æ ‡è¯†ç¬¦ä¸å¯ç”¨</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="328"/>
@@ -1261,21 +1391,11 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<source>Confirm password</source>
<translation>确认密ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>创建密ç æ¥åŠ 密æ¤è®¾å¤‡ä¸Šçš„账户。请注æ„密ç æ— æ³•æ¢å¤ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>å¯é€‰</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<source>Username already taken</source>
<translation>å·²å–得的使用者å稱</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1328,37 +1434,17 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="347"/>
<source>Local</source>
- <translation type="unfinished"/>
+ <translation>本地的</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="348"/>
<source>Encrypt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
+ <translation>åŠ å¯†</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
- <translation type="unfinished"/>
+ <translation>SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="357"/>
@@ -1383,7 +1469,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="361"/>
<source>Personalize account</source>
- <translation type="unfinished"/>
+ <translation>个性化账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="362"/>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>更改当å‰å¯†ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>备份账户到 .gz 文件</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1463,38 +1544,22 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
<source>Advanced account settings</source>
- <translation type="unfinished"/>
+ <translation>高级账户设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="381"/>
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
+ <translation>使用密ç åŠ å¯†æ‚¨çš„è´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
- <translation type="unfinished"/>
+ <translation>输入昵称ã€å§“æ°ã€â€¦â€¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="389"/>
@@ -1571,7 +1636,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="409"/>
<source>Banned</source>
- <translation type="unfinished"/>
+ <translation>å·²å±è”½</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="410"/>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>å·²å±è”½çš„è”系人</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>您确定è¦åˆ 除æ¤è´¦æˆ·å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>å¦‚æžœæ‚¨çš„è´¦æˆ·å°šæœªå¤‡ä»½æˆ–æ·»åŠ åˆ°å…¶ä»–è®¾å¤‡ï¼Œæ‚¨çš„è´¦æˆ·å’Œå·²æ³¨å†Œå称将ä¸å¯æŒ½å›žåœ°ä¸¢å¤±ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1671,7 +1726,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="435"/>
<source>Text zoom</source>
- <translation type="unfinished"/>
+ <translation>æ–‡å—缩放</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="438"/>
@@ -1855,7 +1910,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="486"/>
<source>This feature is in development.</source>
- <translation type="unfinished"/>
+ <translation>æ¤åŠŸèƒ½æ£åœ¨å¼€å‘ä¸ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="489"/>
@@ -1890,7 +1945,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="497"/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"/>
+ <translation>键盘快æ·é”®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="499"/>
@@ -2048,11 +2103,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>从备份创建您的账户</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>您å¯åœ¨è´¦æˆ·è®¾ç½®ä¸ç‚¹å‡»â€œå¯¼å‡ºè´¦æˆ·â€èŽ·å¾—归档。这会在您的设备上创建一个以 .gz 结尾的文件。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2076,12 +2126,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="542"/>
<source>Import a Jami account from an archive file on this device.</source>
- <translation type="unfinished"/>
+ <translation>从设备上的账户档案文件导入 Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="543"/>
<source>Select archive file</source>
- <translation type="unfinished"/>
+ <translation>选择归档文件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="546"/>
@@ -2111,7 +2161,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="552"/>
<source>A PIN is required to use an existing Jami account on this device.</source>
- <translation type="unfinished"/>
+ <translation>éœ€è¦ PIN ç 以在æ¤è®¾å¤‡ä¸Šä½¿ç”¨çŽ°æœ‰çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="553"/>
@@ -2126,12 +2176,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="555"/>
<source>Step 3</source>
- <translation type="unfinished"/>
+ <translation>第3æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="556"/>
<source>Step 4</source>
- <translation type="unfinished"/>
+ <translation>第4æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="557"/>
@@ -2141,17 +2191,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="558"/>
<source>Choose the account to link</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
+ <translation>选择è¦è¿žæŽ¥çš„账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
@@ -2166,7 +2206,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="566"/>
<source>Enter account's password</source>
- <translation type="unfinished"/>
+ <translation>输入账户密ç </translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="567"/>
@@ -2213,11 +2253,6 @@ Please try again later.</source>
<source>Export</source>
<translation>导出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>选择图片作为头åƒ</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2241,7 +2276,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="585"/>
<source>Image Files (*.png *.jpg *.jpeg)</source>
- <translation type="unfinished"/>
+ <translation>图åƒæ–‡ä»¶ (*.png *.jpg *.jpeg)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="588"/>
@@ -2266,7 +2301,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="592"/>
<source>Reset Preferences</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å好设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="593"/>
@@ -2286,12 +2321,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="596"/>
<source>Are you sure you wish to reset %1 preferences?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦é‡ç½®%1å好设置å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="597"/>
<source>Are you sure you wish to uninstall %1?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦å¸è½½ %1 å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
@@ -2326,12 +2361,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="604"/>
<source>Display or hide General plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—通用æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="605"/>
<source>Display or hide Account plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—账户æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="606"/>
@@ -2341,7 +2376,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="607"/>
<source>Plugin Files (*.jpl)</source>
- <translation type="unfinished"/>
+ <translation>æ’件文件 (*.jpl)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="608"/>
@@ -2351,7 +2386,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="609"/>
<source>Select An Image to %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 选择图片</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="610"/>
@@ -2366,7 +2401,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="612"/>
<source>Choose Plugin</source>
- <translation type="unfinished"/>
+ <translation>选择æ’件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="615"/>
@@ -2436,7 +2471,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="632"/>
<source>Screen %1</source>
- <translation type="unfinished"/>
+ <translation>å±å¹• %1</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="635"/>
@@ -2468,7 +2503,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="644"/>
<source>Import from an archive backup</source>
- <translation type="unfinished"/>
+ <translation>从归档备份导入</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="645"/>
@@ -2498,7 +2533,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="650"/>
<source>Configure a SIP account</source>
- <translation type="unfinished"/>
+ <translation>é…ç½® SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="651"/>
@@ -2518,7 +2553,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="654"/>
<source>Join Jami</source>
- <translation type="unfinished"/>
+ <translation>åŠ å…¥ Jami</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="655"/>
@@ -2540,20 +2575,15 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>欢迎æ¥åˆ°</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
- <translation type="unfinished"/>
+ <translation>我已ç»æœ‰ä¸€ä¸ªè´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="661"/>
<source>Use existing Jami account</source>
- <translation type="unfinished"/>
+ <translation>使用现å˜çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="662"/>
@@ -2563,12 +2593,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="663"/>
<source>Share this Jami identifier to be contacted on this account!</source>
- <translation type="unfinished"/>
+ <translation>åˆ†äº«æ¤ Jami æ ‡è¯†ç¬¦ï¼Œæ¥ä¸Žè¿™ä¸ªè´¦æˆ·é€šè®¯ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="664"/>
<source>Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!</source>
- <translation type="unfinished"/>
+ <translation>è¿™é‡Œæ˜¯ä½ çš„ Jami æ ‡è¯†ç¬¦ã€‚ä¸è¦çŠ¹è±«ï¼Œåˆ†äº«å®ƒï¼Œè®©é€šè®¯æ›´æ–¹ä¾¿ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="667"/>
@@ -2736,25 +2766,10 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>åˆ é™¤</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>您真的è¦åˆ 除æ¤ä¼šè¯å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
+ <translation>转移对è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
@@ -2795,17 +2810,17 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="732"/>
<source>%1 Members</source>
- <translation type="unfinished"/>
+ <translation>%1 个æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="733"/>
<source>Member</source>
- <translation type="unfinished"/>
+ <translation>æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="734"/>
<source>Documents</source>
- <translation type="unfinished"/>
+ <translation>文档</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="735"/>
@@ -2815,7 +2830,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="736"/>
<source>Add a description</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ æè¿°</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="738"/>
@@ -2825,12 +2840,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="739"/>
<source>Ignore all notifications from this conversation</source>
- <translation type="unfinished"/>
+ <translation>忽略æ¥è‡ªæ¤å¯¹è¯çš„所有æ醒</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="740"/>
<source>Choose a color</source>
- <translation type="unfinished"/>
+ <translation>选择一个颜色</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="741"/>
@@ -2840,7 +2855,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="742"/>
<source>Leave</source>
- <translation type="unfinished"/>
+ <translation>离开</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="743"/>
@@ -2865,7 +2880,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="749"/>
<source>Go to conversation</source>
- <translation type="unfinished"/>
+ <translation>å‰å¾€ä¼šè¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="750"/>
@@ -2875,63 +2890,48 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="751"/>
<source>Kick member</source>
- <translation type="unfinished"/>
+ <translation>踢出æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="752"/>
<source>Administrator</source>
- <translation type="unfinished"/>
+ <translation>管ç†å‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="753"/>
<source>Invited</source>
- <translation type="unfinished"/>
+ <translation>已邀请</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="754"/>
<source>Remove member</source>
- <translation type="unfinished"/>
+ <translation>移除æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="755"/>
<source>To:</source>
- <translation type="unfinished"/>
+ <translation>至：</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="758"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="759"/>
<source>Tips</source>
- <translation type="unfinished"/>
+ <translation>æ示</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="760"/>
<source>Dismiss</source>
<translation>解散</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>您的账户资料仅会与您的è”系人分享</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -2973,17 +2973,17 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="69"/>
<source>Increase font size</source>
- <translation type="unfinished"/>
+ <translation>å¢žåŠ å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="73"/>
<source>Decrease font size</source>
- <translation type="unfinished"/>
+ <translation>å‡å°‘å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="77"/>
<source>Reset font size</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="86"/>
@@ -3641,126 +3641,126 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/tipsmodel.cpp" line="25"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="27"/>
<source>What does Jami mean?</source>
- <translation type="unfinished"/>
+ <translation>Jami 有何å«ä¹‰ï¼Ÿ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/lrc_zh_TW.ts b/translations/lrc_zh_TW.ts
index 11fabc9ad2e49310c9eb8b9223890cac22b62b8b..2eaf2434c86b8ccca97c5f4a5c6cbecffd1df852 100644
--- a/translations/lrc_zh_TW.ts
+++ b/translations/lrc_zh_TW.ts
@@ -80,7 +80,7 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>æ£€æµ‹åˆ°æ— æ•ˆçš„æ¶ˆæ¯</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
@@ -154,6 +154,11 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="43"/>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
+ <translation>Jami 是通用的通信平å°ï¼Œä»¥éšç§ä¸ºåŸºç¡€ï¼Œä¾èµ–于自由的分布å¼ç½‘络，为æ¯ä¸€ä¸ªäººæœåŠ¡</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -178,7 +183,7 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation>Jami 是一个普é通信平å°ï¼Œå°Šé‡ç”¨æˆ·çš„自由与éšç§ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="58"/>
@@ -213,7 +218,7 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="68"/>
<source>Add to conversation</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ åˆ°å¯¹è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="69"/>
@@ -313,12 +318,12 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
<source>Certificate File (*.crt)</source>
- <translation type="unfinished"/>
+ <translation>è¯ä¹¦æ–‡ä»¶ (*.crt)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="93"/>
<source>Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</source>
- <translation type="unfinished"/>
+ <translation>音频文件 (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="96"/>
@@ -443,7 +448,7 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="124"/>
<source>Key File (*.key)</source>
- <translation type="unfinished"/>
+ <translation>密钥文件 (*.key)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="127"/>
@@ -753,24 +758,144 @@ Jami 將會çµæŸã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>您的帳號僅å˜æ–¼æ¤è£ç½®ä¸Šã€‚如果您éºå¤±äº†æ‚¨çš„è£ç½®æˆ–解除安è£æ‡‰ç”¨ç¨‹å¼ï¼Œæ‚¨çš„帳號將會被刪除且無法復原。您å¯ä»¥ç«‹åˆ»å‚™ä»½æ‚¨çš„帳號或ç¨å¾Œå†åšã€‚</translation>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>在æ¤å‚™ä»½å¸³è™Ÿ</translation>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>備份您的帳號ï¼</translation>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <source>Back up account</source>
<translation>備份帳號</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
<source>Skip</source>
@@ -799,12 +924,12 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
- <translation type="unfinished"/>
+ <translation>Jami 归档文件 (*.gz)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="219"/>
<source>All files (*)</source>
- <translation type="unfinished"/>
+ <translation>所有文件 (*)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="222"/>
@@ -866,12 +991,12 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="236"/>
<source>Mute camera</source>
- <translation type="unfinished"/>
+ <translation>æ‘„åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="237"/>
<source>Unmute camera</source>
- <translation type="unfinished"/>
+ <translation>å–消摄åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="238"/>
@@ -951,22 +1076,17 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>在æ—è¾¹</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>在顶部</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>éšè—自己</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="259"/>
@@ -1007,13 +1127,23 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="268"/>
<source>Confirm action</source>
- <translation type="unfinished"/>
+ <translation>确认æ“作</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="269"/>
<source>Remove conversation</source>
<translation>移除å°è©±</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1032,7 +1162,7 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="275"/>
<source>Conversation details</source>
- <translation type="unfinished"/>
+ <translation>对è¯è¯¦æƒ…</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="278"/>
@@ -1127,7 +1257,7 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>布局设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1157,7 +1287,7 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>这是æ¥è‡ªåŽç«¯çš„错误：%0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1187,7 +1317,7 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="314"/>
<source>Enter the Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>输入 Jami å¸å·ç®¡ç†æœåŠ¡å™¨ï¼ˆJAMS）的 URL</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="315"/>
@@ -1202,7 +1332,7 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="317"/>
<source>Enter JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>输入 JAMS å‡æ®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="318"/>
@@ -1233,17 +1363,17 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="325"/>
<source>Choose a username</source>
- <translation type="unfinished"/>
+ <translation>选择一个用户å</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="326"/>
<source>Choose an identifier</source>
- <translation type="unfinished"/>
+ <translation>é€‰æ‹©ä¸€ä¸ªæ ‡è¯†ç¬¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="327"/>
<source>The identifier is not available</source>
- <translation type="unfinished"/>
+ <translation>è¯¥æ ‡è¯†ç¬¦ä¸å¯ç”¨</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="328"/>
@@ -1261,21 +1391,11 @@ Jami 將會çµæŸã€‚</translation>
<source>Confirm password</source>
<translation>確èªå¯†ç¢¼</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>é¸æ“‡å¯†ç¢¼ä»¥åœ¨æ¤è£ç½®ä¸ŠåŠ 密您的帳號。請注æ„，æ¤å¯†ç¢¼ç„¡æ³•è¢«å¾©åŽŸã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>é¸æ“‡æ€§</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
@@ -1306,20 +1426,6 @@ Jami 將會çµæŸã€‚</translation>
<source>Username already taken</source>
<translation>å·²å–得的使用者å稱</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1328,37 +1434,17 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="347"/>
<source>Local</source>
- <translation type="unfinished"/>
+ <translation>本地的</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="348"/>
<source>Encrypt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
+ <translation>åŠ å¯†</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
- <translation type="unfinished"/>
+ <translation>SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="357"/>
@@ -1383,7 +1469,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="361"/>
<source>Personalize account</source>
- <translation type="unfinished"/>
+ <translation>个性化账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="362"/>
@@ -1440,11 +1526,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>變更目å‰å¯†ç¢¼</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>備份帳號為 .gz 檔案</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -1463,38 +1544,22 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
<source>Advanced account settings</source>
- <translation type="unfinished"/>
+ <translation>高级账户设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="381"/>
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
+ <translation>使用密ç åŠ å¯†æ‚¨çš„è´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
- <translation type="unfinished"/>
+ <translation>输入昵称ã€å§“æ°ã€â€¦â€¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="389"/>
@@ -1571,7 +1636,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="409"/>
<source>Banned</source>
- <translation type="unfinished"/>
+ <translation>å·²å±è”½</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="410"/>
@@ -1583,16 +1648,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>已被阻擋的連絡人</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>您真的想è¦åˆªé™¤æ¤å¸³è™Ÿå—Žï¼Ÿ</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>如果您的帳號未備份，或是新增至其他è£ç½®ï¼Œæ‚¨çš„帳號與已註冊的å稱將會ä¸å¯é€†åœ°éºå¤±ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1671,7 +1726,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="435"/>
<source>Text zoom</source>
- <translation type="unfinished"/>
+ <translation>æ–‡å—缩放</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="438"/>
@@ -1855,7 +1910,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="486"/>
<source>This feature is in development.</source>
- <translation type="unfinished"/>
+ <translation>æ¤åŠŸèƒ½æ£åœ¨å¼€å‘ä¸ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="489"/>
@@ -1890,7 +1945,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="497"/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"/>
+ <translation>键盘快æ·é”®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="499"/>
@@ -2048,11 +2103,6 @@ Please try again later.</source>
<source>Create your account from a backup</source>
<translation>從備份建立您的帳號</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>您å¯ä»¥é€éŽé»žé¸å¸³è™Ÿè¨å®šä¸çš„「備份帳號ã€ä¾†å–å¾—å°å˜ã€‚這會在您的è£ç½®ä¸Šå»ºç«‹ä¸€å€‹ .gz 檔案。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2076,12 +2126,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="542"/>
<source>Import a Jami account from an archive file on this device.</source>
- <translation type="unfinished"/>
+ <translation>从设备上的账户档案文件导入 Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="543"/>
<source>Select archive file</source>
- <translation type="unfinished"/>
+ <translation>选择归档文件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="546"/>
@@ -2111,7 +2161,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="552"/>
<source>A PIN is required to use an existing Jami account on this device.</source>
- <translation type="unfinished"/>
+ <translation>éœ€è¦ PIN ç 以在æ¤è®¾å¤‡ä¸Šä½¿ç”¨çŽ°æœ‰çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="553"/>
@@ -2126,12 +2176,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="555"/>
<source>Step 3</source>
- <translation type="unfinished"/>
+ <translation>第3æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="556"/>
<source>Step 4</source>
- <translation type="unfinished"/>
+ <translation>第4æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="557"/>
@@ -2141,17 +2191,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="558"/>
<source>Choose the account to link</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
+ <translation>选择è¦è¿žæŽ¥çš„账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
@@ -2166,7 +2206,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="566"/>
<source>Enter account's password</source>
- <translation type="unfinished"/>
+ <translation>输入账户密ç </translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="567"/>
@@ -2213,11 +2253,6 @@ Please try again later.</source>
<source>Export</source>
<translation>匯出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>é¸æ“‡è¦æˆç‚ºå¤§é 貼的圖片</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2241,7 +2276,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="585"/>
<source>Image Files (*.png *.jpg *.jpeg)</source>
- <translation type="unfinished"/>
+ <translation>图åƒæ–‡ä»¶ (*.png *.jpg *.jpeg)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="588"/>
@@ -2266,7 +2301,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="592"/>
<source>Reset Preferences</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å好设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="593"/>
@@ -2286,12 +2321,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="596"/>
<source>Are you sure you wish to reset %1 preferences?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦é‡ç½®%1å好设置å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="597"/>
<source>Are you sure you wish to uninstall %1?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦å¸è½½ %1 å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
@@ -2326,12 +2361,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="604"/>
<source>Display or hide General plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—通用æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="605"/>
<source>Display or hide Account plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—账户æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="606"/>
@@ -2341,7 +2376,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="607"/>
<source>Plugin Files (*.jpl)</source>
- <translation type="unfinished"/>
+ <translation>æ’件文件 (*.jpl)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="608"/>
@@ -2351,7 +2386,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="609"/>
<source>Select An Image to %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 选择图片</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="610"/>
@@ -2366,7 +2401,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="612"/>
<source>Choose Plugin</source>
- <translation type="unfinished"/>
+ <translation>选择æ’件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="615"/>
@@ -2436,7 +2471,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="632"/>
<source>Screen %1</source>
- <translation type="unfinished"/>
+ <translation>å±å¹• %1</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="635"/>
@@ -2468,7 +2503,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="644"/>
<source>Import from an archive backup</source>
- <translation type="unfinished"/>
+ <translation>从归档备份导入</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="645"/>
@@ -2498,7 +2533,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="650"/>
<source>Configure a SIP account</source>
- <translation type="unfinished"/>
+ <translation>é…ç½® SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="651"/>
@@ -2518,7 +2553,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="654"/>
<source>Join Jami</source>
- <translation type="unfinished"/>
+ <translation>åŠ å…¥ Jami</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="655"/>
@@ -2540,20 +2575,15 @@ Copy and share it with your friends!</source>
<source>Welcome to</source>
<translation>æ¡è¿Žä¾†åˆ°</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
- <translation type="unfinished"/>
+ <translation>我已ç»æœ‰ä¸€ä¸ªè´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="661"/>
<source>Use existing Jami account</source>
- <translation type="unfinished"/>
+ <translation>使用现å˜çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="662"/>
@@ -2563,12 +2593,12 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="663"/>
<source>Share this Jami identifier to be contacted on this account!</source>
- <translation type="unfinished"/>
+ <translation>åˆ†äº«æ¤ Jami æ ‡è¯†ç¬¦ï¼Œæ¥ä¸Žè¿™ä¸ªè´¦æˆ·é€šè®¯ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="664"/>
<source>Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!</source>
- <translation type="unfinished"/>
+ <translation>è¿™é‡Œæ˜¯ä½ çš„ Jami æ ‡è¯†ç¬¦ã€‚ä¸è¦çŠ¹è±«ï¼Œåˆ†äº«å®ƒï¼Œè®©é€šè®¯æ›´æ–¹ä¾¿ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="667"/>
@@ -2736,25 +2766,10 @@ Copy and share it with your friends!</source>
<source>Remove</source>
<translation>移除</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>您真的想è¦ç§»é™¤æ¤å°è©±å—Žï¼Ÿ</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
+ <translation>转移对è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="722"/>
@@ -2795,17 +2810,17 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="732"/>
<source>%1 Members</source>
- <translation type="unfinished"/>
+ <translation>%1 个æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="733"/>
<source>Member</source>
- <translation type="unfinished"/>
+ <translation>æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="734"/>
<source>Documents</source>
- <translation type="unfinished"/>
+ <translation>文档</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="735"/>
@@ -2815,7 +2830,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="736"/>
<source>Add a description</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ æè¿°</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="738"/>
@@ -2825,12 +2840,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="739"/>
<source>Ignore all notifications from this conversation</source>
- <translation type="unfinished"/>
+ <translation>忽略æ¥è‡ªæ¤å¯¹è¯çš„所有æ醒</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="740"/>
<source>Choose a color</source>
- <translation type="unfinished"/>
+ <translation>选择一个颜色</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="741"/>
@@ -2840,7 +2855,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="742"/>
<source>Leave</source>
- <translation type="unfinished"/>
+ <translation>离开</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="743"/>
@@ -2865,7 +2880,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="749"/>
<source>Go to conversation</source>
- <translation type="unfinished"/>
+ <translation>å‰å¾€ä¼šè¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="750"/>
@@ -2875,63 +2890,48 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="751"/>
<source>Kick member</source>
- <translation type="unfinished"/>
+ <translation>踢出æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="752"/>
<source>Administrator</source>
- <translation type="unfinished"/>
+ <translation>管ç†å‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="753"/>
<source>Invited</source>
- <translation type="unfinished"/>
+ <translation>已邀请</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="754"/>
<source>Remove member</source>
- <translation type="unfinished"/>
+ <translation>移除æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="755"/>
<source>To:</source>
- <translation type="unfinished"/>
+ <translation>至：</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="758"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="759"/>
<source>Tips</source>
- <translation type="unfinished"/>
+ <translation>æ示</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="760"/>
<source>Dismiss</source>
<translation>忽略</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>您的介紹僅與您的è¯çµ¡äººåˆ†äº«</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>KeyboardShortcutTable</name>
@@ -2973,17 +2973,17 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="69"/>
<source>Increase font size</source>
- <translation type="unfinished"/>
+ <translation>å¢žåŠ å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="73"/>
<source>Decrease font size</source>
- <translation type="unfinished"/>
+ <translation>å‡å°‘å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="77"/>
<source>Reset font size</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="86"/>
@@ -3641,126 +3641,126 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/tipsmodel.cpp" line="25"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="27"/>
<source>What does Jami mean?</source>
- <translation type="unfinished"/>
+ <translation>Jami 有何å«ä¹‰ï¼Ÿ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index 29f61922269c56768a1dc07716ff614e5ac94694..07f1386289a6d3cb4121e83900b09801c9925505 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -220,11 +220,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -390,11 +385,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -427,21 +417,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +463,45 @@
<source>Enable</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +603,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,18 +945,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1082,11 +1106,6 @@
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1136,6 @@
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1327,21 @@
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,20 +1367,6 @@
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1377,26 +1382,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1482,11 +1467,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1502,27 +1482,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1604,11 +1568,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3660,118 +3660,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index 46d1aad66cf1151208c2095c4a0ac6e582c1c962..ff1b4809090622d8921e1307c04dedaf89350d97 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>إنشاء نقطة اجتماع</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>اختر اسماً لنقطة الاجتماع</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>تÙعيل</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>لا يوجد Ùيديو</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>إزالة المØادثة</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>اختياري</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>اسم المستخدم مستخدم بالÙعل</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>رÙض</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Øسابك مشارك Ùقط مع جهات إتصالك</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>نسخ</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>تصدير</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ar_EG.ts b/translations/ring_client_windows_ar_EG.ts
index 2fa29eae9f0e9749322a3dff89c0ec0ffe236772..b783133aedd6e201ad077a6451e05a664a5ad4d4 100644
--- a/translations/ring_client_windows_ar_EG.ts
+++ b/translations/ring_client_windows_ar_EG.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>إنشاء نقطة اجتماع</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>اختر اسماً لنقطة الاجتماع</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>تÙعيل</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>لا يوجد Ùيديو</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>إزالة المØادثة</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>اختياري</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>اسم المستخدم مستخدم بالÙعل</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>رÙض</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Øسابك مشارك Ùقط مع جهات إتصالك</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>نسخ</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>تصدير</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_az.ts b/translations/ring_client_windows_az.ts
index 2f719a0616945a2cdb6995ebdbe081e35a5be8ee..8d7d76b4bae56017ba848fa8276683ffe72cd2e8 100644
--- a/translations/ring_client_windows_az.ts
+++ b/translations/ring_client_windows_az.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>video yoxdur</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_be.ts b/translations/ring_client_windows_be.ts
index 960bc8f8ad9790bb60209eda858f1d5432cc4ab7..b035b3ea5a441badb9c280d7204ee159790864e8 100644
--- a/translations/ring_client_windows_be.ts
+++ b/translations/ring_client_windows_be.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>відÑа нÑма</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_be_BY.ts b/translations/ring_client_windows_be_BY.ts
index 69e0bd6a03a0f586ecf147757fdf732f2b6ff045..f62d9d4cbfcb020f16c3134b2563e89bd5746a93 100644
--- a/translations/ring_client_windows_be_BY.ts
+++ b/translations/ring_client_windows_be_BY.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>відÑа нÑма</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index 622e9e4420ea0af38f9efde2b730e8a24242f5e5..a19aca7bdcba04d719d63e5a3a1779a27b3229fc 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>нÑма видео</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Премахване на разговора</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Потвърдете паролата</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>ПотребителÑкото име вече е заето</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Отказ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Профилът Ви Ñе ÑÐ¿Ð¾Ð´ÐµÐ»Ñ Ñамо Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸Ñ‚Ðµ Ви</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Копиране</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>ИзнаÑÑне</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_bg_BG.ts b/translations/ring_client_windows_bg_BG.ts
index 3ce07b73de168178f24a9e15d8b6a2c684b925ec..008c07104fa79fdb36a143e5349049abd68b6502 100644
--- a/translations/ring_client_windows_bg_BG.ts
+++ b/translations/ring_client_windows_bg_BG.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>нÑма видео</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Премахване на разговора</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Потвърдете паролата</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>ПотребителÑкото име вече е заето</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Отказ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Профилът Ви Ñе ÑÐ¿Ð¾Ð´ÐµÐ»Ñ Ñамо Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸Ñ‚Ðµ Ви</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Копиране</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>ИзнаÑÑне</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_bn.ts b/translations/ring_client_windows_bn.ts
index cb6fac22842bd62213054cac72c0b74f9c014b39..e2e09e5b3bd45ec4a6072abbe26db7c59f431fa1 100644
--- a/translations/ring_client_windows_bn.ts
+++ b/translations/ring_client_windows_bn.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>কোন à¦à¦¿à¦¡à¦¿à¦“</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index bef65318586dc0a9194dead16bcef5b8361ce0c3..d31621aa66e4fd4fd6985f53b93c341a22804206 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Habilita</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>cap vÃdeo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fes còpia de seguretat del compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fes còpia de seguretat del compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Esborra conversa</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Realment vol eliminar aquesta conversa?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmi contrasenya</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Nom d'usuari ja registrat.</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contactes blocats</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Ignora</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>El vostre perfil només es comparteix amb els vostres contactes</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Copia</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exporta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Copiï'l i comparteixi'l amb els seus amics!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts
index 46e72983a0b3586d99a67801e257bd92acde2fa4..f05d1c82f97689dd64efbae0525ce79f4e8945a9 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Vybrat snÃmkovou frekvenci (snÃmky za sekundu)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>VytvoÅ™it mÃsto schůzky</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Zvolte si heslo k Å¡ifrovánà úÄtu na tomto zaÅ™ÃzenÃ. MÄ›jte na vÄ›domÃ, že heslo nelze obnovit.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Zvolte si název své schůzky.</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Povolit</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>žádné video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Zálohovat úÄet zde</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Zálohujte svůj úÄet!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Zálohovat úÄet</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Odstranit konverzaci</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Opravdu chcete odstranit tuto konverzaci?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Potvrdit heslo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Volitelné</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Uživatelské jméno je již zabrané.</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>ZmÄ›nit souÄasné heslo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Zálohovat úÄet do souboru .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Zkuste to, prosÃm, pozdÄ›ji znovu.</translation>
<source>Banned contacts</source>
<translation>Zakázané kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Jste si jisti, že chcete smazat tento úÄet?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Přejete si nynà provést aktualizaci?</translation>
<source>Network disconnected</source>
<translation>SÃÅ¥ odpojena.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Přejete si nynà provést aktualizaci?</translation>
<source>Dismiss</source>
<translation>OdmÃtnout</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Váš profil je sdÃlen jen s vaÅ¡imi kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>ZkopÃrovat</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Skrýt zakázané kontakty</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>VytvoÅ™it váš úÄet ze zálohy</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Archiv zÃskáte kliknutÃm na „Zálohovat úÄet“ v nastavenà úÄtu. Vytvořà se tÃm soubor .gz na vaÅ¡em zaÅ™ÃzenÃ.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exportovat</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Zvolit si profilový obrázek</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3661,118 +3661,118 @@ ZkopÃrujte je a sdÃlejte je se svými přáteli!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_da.ts b/translations/ring_client_windows_da.ts
index e257726e0b3ff7362fa9f7dca02f092abaf57b4d..7709509658ec50777d32b1784353c5198e3ba0f3 100644
--- a/translations/ring_client_windows_da.ts
+++ b/translations/ring_client_windows_da.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Tillad</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>ingen video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Bekræft adgangskode</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Valgfri</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Brugernavn er allerede taget</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Blokerede kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Afvis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Din profil vil kun blive delt med dine kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiér</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Skjul blokerede kontakter</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Eksport</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Kopier og del det med dine venner!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index 7babe6fc7266bf7d2daeab154e8d370a656ad1a1..ab52813b337c8f5b59141ed8b087a3b8a6667f18 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -220,11 +220,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -390,11 +385,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -427,21 +417,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +463,45 @@
<source>Enable</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +603,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,18 +945,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1082,11 +1106,6 @@
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1136,6 @@
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1327,21 @@
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,20 +1367,6 @@
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1377,26 +1382,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1482,11 +1467,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1502,27 +1482,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1604,11 +1568,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3660,118 +3660,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index 6807b503daa3e9b3622ea8f6662177e1af7d8031..67d6cef76339466d7bb97d74be48d92ed8406e59 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -78,22 +78,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Beim Abrufen dieses Repositorys ist ein Fehler aufgetreten</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Der Unterhaltungsmodus wird nicht erkannt</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>Eine ungültige Nachricht wurde erkannt</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Nicht genügend Autorisierung zum Aktualisieren der Unterhaltungsinformationen</translation>
</message>
</context>
<context>
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>eingehender Videoanruf von {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Die Migration zur Schwarm-Technologie ermöglicht die Synchronisierung dieser Konversation auf mehreren Geräten und verbessert die Zuverlässigkeit. Der gespeicherte Unterhaltungsverlauf wird dabei gelöscht.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Videobildrate auswählen (Bilder pro Sekunde)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ihr Konto existiert nur auf diesem Gerät. Wenn Sie Ihr Gerät verlieren oder die Anwendung deinstallieren, wird Ihr Konto gelöscht und kann nicht wiederhergestellt werden. Sie können Ihr Konto jetzt oder später sichern.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Treffpunkt erstellen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Wählen Sie ein Passwort, um Ihr Konto auf diesem Gerät zu verschlüsseln. Beachten Sie, dass das Passwort nicht wiederhergestellt werden kann.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Einen Namen für den Treffpunkt wählen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Wenn Ihr Konto nicht gesichert oder zu einem anderen Gerät hinzugefügt wurde, gehen Ihr Konto und Ihr registrierter Name unwiderruflich verloren.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Aktivieren</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami ist eine universelle Kommunikationsplattform mit Datenschutz als Grundlage, die sich auf ein kostenloses verteiltes Netzwerk für alle stützt.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>kein Video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Backup des Kontos hier</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Sichern Sie Ihr Konto!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Konto sichern</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Auf der Seite</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>An der Spitze</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>selbst ausblenden</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Unterhaltung entfernen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wollen Sie wirklich diese Konversation löschen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Möchten Sie diese Unterhaltung wirklich blockieren?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Layout-Einstellungen</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Dies ist der Fehler vom Backend: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Passwort bestätigen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>Dieser Benutzername ist bereits vergeben</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sind Sie sicher, dass Sie Jami ohne Benutzernamen beitreten möchten?
-Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zugewiesen.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- Maximal 32 Zeichen
-- Alphabetische Zeichen (A bis Z)
-- Numerische Zeichen (0 bis 9)
-- Sonderzeichen erlaubt: Bindestrich (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Encrypt</source>
<translation>Verschlüsseln</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Dieser Account wird lokal erstellt</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Es wird empfohlen, einen Benutzernamen zu wählen, dieser kann nicht geändert werden</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Das Verschlüsseln Ihres Kontos mit einem Passwort ist optional und kann nicht wiederhergestellt werden</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Das Bild und der Spitzname sind optional und können in den Einstellungen geändert werden</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Change current password</source>
<translation>Aktuelles Passwort ändern</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Konto in einer .gz-Datei sichern</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,28 +1480,11 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Customize profile</source>
<translation>Profil anpassen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Dieses Profil wird nur mit den Kontakten dieses Kontos geteilt.
-Das Profil kann jederzeit in den Kontoeinstellungen geändert werden.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Verschlüsseln Sie Ihr Konto mit einem Passwort</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Ein Jami-Konto wird nur auf diesem Gerät als Archiv registriert, das die Schlüssel Ihres Kontos enthält. Der Zugriff auf dieses Archiv kann durch ein Passwort geschützt werden.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Bitte beachten Sie, dass ein verlorenes Passwort nicht wiederhergestellt werden kann!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1608,11 +1567,6 @@ Bitte versuchen Sie es später erneut.</translation>
<source>Banned contacts</source>
<translation>Gesperrte Kontakte</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Möchten Sie dieses Konto wirklich löschen?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1810,6 +1764,31 @@ Möchten Sie jetzt updaten?</translation>
<source>Network disconnected</source>
<translation>Netzwerk getrennt</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1935,26 +1914,11 @@ Möchten Sie jetzt updaten?</translation>
<source>Dismiss</source>
<translation>Verwerfen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Fügen Sie ein Bild und einen Spitznamen hinzu, um Ihr Profil zu vervollständigen</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Dieses Profil wird nur mit den Kontakten dieses Kontos geteilt</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Ihr Profil wird nur mit Ihren Kontakten geteilt</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Warum sollte ich mein Konto speichern?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2105,11 +2069,6 @@ Jami wird jetzt beendet.</translation>
<source>Join Jami</source>
<translation>Mitmachen bei Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Teilen Sie frei und privat mit Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2228,6 +2187,26 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation>Konto sichern</translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2263,6 +2242,11 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>You are still muted on your device</source>
<translation>Sie sind auf Ihrem Gerät immer noch stummgeschaltet</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2273,6 +2257,16 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Confirm action</source>
<translation>Aktion bestätigen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2318,11 +2312,6 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>The identifier is not available</source>
<translation>Dieser Identifikator ist nicht verfügbar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Sie können einen Benutzernamen auswählen, der auf Jami leicht gefunden und erreicht werden kann.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2333,6 +2322,22 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Hide advanced settings</source>
<translation>Erweiterte Einstellungen ausblenden</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2343,6 +2348,16 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Hide banned contacts</source>
<translation>Gesperrte Kontakte ausblenden</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2528,11 +2543,6 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Create your account from a backup</source>
<translation>Konto aus einem Backup erstellen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Sie können ein Archiv erstellen, indem Sie in den Kontoeinstellungen auf "Konto sichern" klicken. Dadurch wird eine .gz-Datei auf Ihrem Gerät erstellt.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2598,16 +2608,6 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Choose the account to link</source>
<translation>Wählen Sie das zu verknüpfende Konto aus</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Wählen Sie „Anderes Gerät verknüpfen“</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Der PIN-Code ist 10 Minuten lang verfügbar.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2663,11 +2663,6 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Export</source>
<translation>Export</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Ein Bild als Avatar auswählen</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3664,120 @@ Kopieren und teilen Sie diesen mit Ihren Freunden!</translation>
<source>What does Jami mean?</source>
<translation>Was bedeutet Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Die Wahl des Namens Jami wurde vom Suaheli-Wort jamii inspiriert, was Gemeinschaft als Substantiv und zusammen als Adverb bedeutet.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Was ist der grüne Punkt neben meinem Account?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Ein roter Punkt bedeutet, dass Ihr Account vom Netzwerk getrennt ist, er wird grün, wenn es verbunden ist</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Warum sollte ich mein Konto sichern?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami ist verteilt und Ihr Konto wird nur auf Ihrem Gerät gespeichert. Wenn Sie Ihr Passwort oder Ihre Daten verlieren, können Sie diese nicht wiederherstellen</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Kann ich einen Konferenzanruf machen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>In einem Anruf können Sie auf „Teilnehmer hinzufügen“ klicken, um einen Kontakt zu einem Anruf hinzuzufügen</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Hat Jami Gruppenchats?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>In den Einstellungen können Sie die Unterstützung für Gruppen aktivieren (experimentell)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Was ist ein Jami-Account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Ein Jami-Konto ist ein asymmetrischer Verschlüsselungsschlüssel. Ihr Konto wird durch eine Jami-ID identifiziert, die ein Fingerabdruck Ihres öffentlichen Schlüssels ist.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Welche Informationen muss ich angeben, um ein Jami-Konto zu erstellen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Wenn Sie ein neues Jami-Konto erstellen, müssen Sie keine privaten Informationen wie E-Mail, Adresse oder Telefonnummer angeben.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Warum muss ich kein Passwort verwenden?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Bei Jami wird Ihr Konto in einem Ordner auf Ihrem Gerät gespeichert. Das Passwort wird nur zum Verschlüsseln Ihres Accounts verwendet, um Sie vor jemandem zu schützen, der physischen Zugriff auf Ihr Gerät hat.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Warum muss ich keinen Benutzernamen registrieren?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Die dauerhafteste und sicherste Kennung ist Ihre Jami-ID, aber da diese für manche Personen schwierig zu verwenden ist, haben Sie auch die Möglichkeit, einen Benutzernamen zu registrieren.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Wie kann ich mein Konto sichern?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>In den Kontoeinstellungen steht eine Schaltfläche zum Sichern Ihres Kontos zur Verfügung.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Warum muss ich kein Passwort verwenden?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Was passiert, wenn ich mein Konto lösche?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Warum muss ich keinen Benutzernamen registrieren?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Ihr Konto wird nur auf Ihren eigenen Geräten gespeichert. Wenn Sie Ihr Konto von jedem Gerät löschen, ist das Konto weg und Sie können es nicht wiederherstellen.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Die dauerhafteste und sicherste Kennung ist Ihre Jami-ID, aber da diese für manche Personen schwierig zu verwenden ist, haben Sie auch die Möglichkeit, einen Benutzernamen zu registrieren.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Kann ich mein Konto auf mehreren Geräten verwenden?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Wie kann ich mein Konto sichern?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Ja, Sie können Ihr Konto über die Einstellungen verknüpfen oder Ihr Backup auf einem anderen Gerät importieren.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Was passiert, wenn ich mein Konto lösche?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts
index 9e2acf0eefe69091416db5659f42eb83c7cf1ec8..4ab910a9364d631e7e8b3c8554937e05199e8d46 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -78,22 +78,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Beim Abrufen dieses Repositorys ist ein Fehler aufgetreten</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Der Unterhaltungsmodus wird nicht erkannt</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>Eine ungültige Nachricht wurde erkannt</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Nicht genügend Autorisierung zum Aktualisieren der Unterhaltungsinformationen</translation>
</message>
</context>
<context>
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Eingehender Videoanruf von {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Die Migration zur Schwarm-Technologie ermöglicht die Synchronisierung dieser Konversation auf mehreren Geräten und verbessert die Zuverlässigkeit. Der gespeicherte Unterhaltungsverlauf wird dabei gelöscht.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Video-Bildrate auswählen (Bilder pro Sekunde)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ihr Konto existiert nur auf diesem Gerät. Wenn Sie Ihr Gerät verlieren oder die Anwendung deinstallieren, wird Ihr Konto gelöscht und kann nicht wiederhergestellt werden. Sie können Ihr Konto jetzt oder später sichern.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Einen Rendezvous-Treffpunkt erstellen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Wählen Sie ein sicheres Passwort um den Schlüssel für Ihre Anmeldedaten auf diesem Gerät sicher zu verschlüsseln. Beachten Sie, dass dieses Passwort nicht wiederhergestellt werden kann, wenn Sie es verlieren.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Wählen Sie einen Namen für das Renzezvous.</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Wenn Ihr Konto nicht gesichert oder zu einem anderen Gerät hinzugefügt wurde, gehen Ihr Konto und Ihr registrierter Name unwiderruflich verloren.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Einschalten</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami ist eine universelle Kommunikationsplattform mit Datenschutz als Grundlage, die sich auf ein kostenloses verteiltes Netzwerk für alle stützt.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>kein Video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Konto hier sichern</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Erstellen Sie eine Sicherheitskopie Ihres Kontos!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Konto sichern</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Auf der Seite</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>An der Spitze</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Selbst ausblenden</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Entferne Gespräch</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wollen Sie diese Unterhaltung wirklich löschen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Möchten Sie diese Unterhaltung wirklich blockieren?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Layout-Einstellungen</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Dies ist der Fehler vom Backend: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Konto bestätigen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Nicht zwingend erforderlich</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>Benutzername bereits vergeben</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sind Sie sicher, dass Sie Jami ohne Benutzernamen beitreten möchten?
-Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zugewiesen.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- Maximal 32 Zeichen
-- Alphabetische Zeichen (A bis Z)
-- Numerische Zeichen (0 bis 9)
-- Sonderzeichen erlaubt: Bindestrich (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Encrypt</source>
<translation>Verschlüsseln</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Dieser Account wird lokal erstellt</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Es wird empfohlen, einen Benutzernamen zu wählen, dieser kann nicht geändert werden</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Das Verschlüsseln Ihres Kontos mit einem Passwort ist optional und kann nicht wiederhergestellt werden</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Das Bild und der Spitzname sind optional und können in den Einstellungen geändert werden</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Change current password</source>
<translation>Das aktuelle Passwort ändern</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Konto in .gz-Datei sichern</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,28 +1480,11 @@ Wenn ja, wird diesem Konto nur eine zufällig generierte 40-stellige Kennung zug
<source>Customize profile</source>
<translation>Profil anpassen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Dieses Profil wird nur mit den Kontakten dieses Kontos geteilt.
-Das Profil kann jederzeit in den Kontoeinstellungen geändert werden.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Verschlüsseln Sie Ihr Konto mit einem Passwort</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Ein Jami-Konto wird nur auf diesem Gerät als Archiv registriert, das die Schlüssel Ihres Kontos enthält. Der Zugriff auf dieses Archiv kann durch ein Passwort geschützt werden.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Bitte beachten Sie, dass ein verlorenes Passwort nicht wiederhergestellt werden kann!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1608,11 +1567,6 @@ Versuchen Sie es später erneut.</translation>
<source>Banned contacts</source>
<translation>Blockierte Kontakte</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Wollen Sie dieses Konto wirklich löschen?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1810,6 +1764,31 @@ Möchten Sie jetzt aktualisieren? </translation>
<source>Network disconnected</source>
<translation>Netzwerk nicht erreichbar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1935,26 +1914,11 @@ Möchten Sie jetzt aktualisieren? </translation>
<source>Dismiss</source>
<translation>Abweisen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Fügen Sie ein Bild und einen Spitznamen hinzu, um Ihr Profil zu vervollständigen</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Dieses Profil wird nur mit den Kontakten dieses Kontos geteilt</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Dein Profil wird nur mit deinen Kontakten geteilt</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Warum sollte ich mein Konto speichern?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2105,11 +2069,6 @@ Jami wird nun beendet.</translation>
<source>Join Jami</source>
<translation>Mitmachen bei Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Teilen Sie frei und privat mit Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2228,6 +2187,26 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2263,6 +2242,11 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>You are still muted on your device</source>
<translation>Sie sind auf Ihrem Gerät immer noch stummgeschaltet</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2273,6 +2257,16 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Confirm action</source>
<translation>Aktion bestätigen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2318,11 +2312,6 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>The identifier is not available</source>
<translation>Dieser Identifikator ist nicht verfügbar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Sie können einen Benutzernamen auswählen, der auf Jami leicht gefunden und erreicht werden kann.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2333,6 +2322,22 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Hide advanced settings</source>
<translation>Erweiterte Einstellungen ausblenden</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2343,6 +2348,16 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Hide banned contacts</source>
<translation>Gesperrte Kontakte verbergen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2528,11 +2543,6 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Create your account from a backup</source>
<translation>Konto aus Backup erstellen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Sie können ein Archiv erstellen, indem Sie in den Kontoeinstellungen "Konto sichern" auswählen. So erstellen Sie eine .gz-Datei auf Ihrem Gerät.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2598,16 +2608,6 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Choose the account to link</source>
<translation>Wählen Sie das zu verknüpfende Konto aus</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Wählen Sie „Anderes Gerät verknüpfen“</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Der PIN-Code ist 10 Minuten lang verfügbar.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2663,11 +2663,6 @@ eine Verbindung herstellt, um die Unterhaltung zu synchronisieren.</translation>
<source>Export</source>
<translation>Exportieren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Wählen Sie ein Bild als Avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3664,120 @@ Kopieren Sie ihn und teilen Sie ihn mit Ihren Freunden!</translation>
<source>What does Jami mean?</source>
<translation>Was bedeutet Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Die Wahl des Namens Jami wurde vom Suaheli-Wort jamii inspiriert, was Gemeinschaft als Substantiv und zusammen als Adverb bedeutet.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Was ist der grüne Punkt neben meinem Account?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Ein roter Punkt bedeutet, dass Ihr Account vom Netzwerk getrennt ist, er wird grün, wenn es verbunden ist</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Warum sollte ich mein Konto sichern?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami ist verteilt und Ihr Konto wird nur auf Ihrem Gerät gespeichert. Wenn Sie Ihr Passwort oder Ihre Daten verlieren, können Sie diese nicht wiederherstellen</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Kann ich einen Konferenzanruf machen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>In einem Anruf können Sie auf „Teilnehmer hinzufügen“ klicken, um einen Kontakt zu einem Anruf hinzuzufügen</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Hat Jami Gruppenchats?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>In den Einstellungen können Sie die Unterstützung für Gruppen aktivieren (experimentell)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Was ist ein Jami-Account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Ein Jami-Konto ist ein asymmetrischer Verschlüsselungsschlüssel. Ihr Konto wird durch eine Jami-ID identifiziert, die ein Fingerabdruck Ihres öffentlichen Schlüssels ist.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Welche Informationen muss ich angeben, um ein Jami-Konto zu erstellen?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Wenn Sie ein neues Jami-Konto erstellen, müssen Sie keine privaten Informationen wie E-Mail, Adresse oder Telefonnummer angeben.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Warum muss ich kein Passwort verwenden?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Bei Jami wird Ihr Konto in einem Ordner auf Ihrem Gerät gespeichert. Das Passwort wird nur zum Verschlüsseln Ihres Accounts verwendet, um Sie vor jemandem zu schützen, der physischen Zugriff auf Ihr Gerät hat.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Warum muss ich keinen Benutzernamen registrieren?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Die dauerhafteste und sicherste Kennung ist Ihre Jami-ID, aber da diese für manche Personen schwierig zu verwenden ist, haben Sie auch die Möglichkeit, einen Benutzernamen zu registrieren.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Wie kann ich mein Konto sichern?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>In den Kontoeinstellungen steht eine Schaltfläche zum Sichern Ihres Kontos zur Verfügung.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Warum muss ich kein Passwort verwenden?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Was passiert, wenn ich mein Konto lösche?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Warum muss ich keinen Benutzernamen registrieren?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Ihr Konto wird nur auf Ihren eigenen Geräten gespeichert. Wenn Sie Ihr Konto von jedem Gerät löschen, ist das Konto weg und Sie können es nicht wiederherstellen.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Die dauerhafteste und sicherste Kennung ist Ihre Jami-ID, aber da diese für manche Personen schwierig zu verwenden ist, haben Sie auch die Möglichkeit, einen Benutzernamen zu registrieren.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Kann ich mein Konto auf mehreren Geräten verwenden?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Wie kann ich mein Konto sichern?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Ja, Sie können Ihr Konto über die Einstellungen verknüpfen oder Ihr Backup auf einem anderen Gerät importieren.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Was passiert, wenn ich mein Konto lösche?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index f9a0024b89073e947b4a49696c2b5178aba45478..b7de6d4fe78294e6629355109f0d414f6c6b52bd 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>ΔημιουÏγεία σημείου συνάντησης</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>δεν υπάÏχει βίντεο</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Î ÏοεÏαιτικό</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Το όνομα χÏήστη ήδη χÏησιμοποιείται</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>ΑπόÏÏιψη</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Το Ï€Ïοφίλ σας διαμοιÏάζεται μόνο με τις επαφÎÏ‚ σας</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>ΑντιγÏαφή</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Εξαγωγή</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_en_CA.ts b/translations/ring_client_windows_en_CA.ts
index ea2e18a3a890de35b1490ef6a1a8741c092a5fce..2c3a37d424c4029e7c7c96f47a138526f2c80bcc 100644
--- a/translations/ring_client_windows_en_CA.ts
+++ b/translations/ring_client_windows_en_CA.ts
@@ -220,11 +220,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -390,11 +385,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -427,21 +417,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +463,45 @@
<source>Enable</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +603,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,18 +945,18 @@
<translation>no video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1082,11 +1106,6 @@
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1136,6 @@
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1327,21 @@
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,20 +1367,6 @@
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1377,26 +1382,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1482,11 +1467,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1502,27 +1482,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1604,11 +1568,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3660,118 +3660,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index 929c3bafc344f26d643b9e24fff23f0ccf276a80..fca37f9430f8e032f0bc300c1aa3fd0abd4e6cbd 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>no video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_en_IE.ts b/translations/ring_client_windows_en_IE.ts
index 15ece1c8fad3bf22ec02de68f7b7bea41929bbcc..bb6e107d5aa69e59bd0dcf56e8b9052e410dc713 100644
--- a/translations/ring_client_windows_en_IE.ts
+++ b/translations/ring_client_windows_en_IE.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>no video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index c65f5e8cf2a88f2a90eb471c0fb8a24540bda85c..16415d6ffb7f2419b1d62b64edeac4cf49e340d5 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>neniu video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Konfirmu pasvorton</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Uzantnomo jam prenita</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopii</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Elporti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index 9cf2f1a64e651e97f94d288eef27d73aa3950501..c1965fc9f329fa37c4a9903491bf19556d6df28c 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Videollamada entrante de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Seleccione la tasa de cuadros de vÃdeo (cuadros por segundo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Esta cuenta sólo existe en este dispositivo. Si lo pierdes o desinstalas la aplicación, tu cuenta se borrará y no se podrá recuperar. Puedes crear un archivo de respaldo de tu cuenta ahora o más adelante.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Crear un punto de encuentro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Elija una contraseña para encriptar tu cuenta en este dispositivo. Tenga en cuenta que la contraseña no podrá ser recuperada</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Elija un nombre para tu punto de encuentro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si no has creado un archivo de respaldo ni has vinculado tu cuenta a otro dispositivo, tu cuenta y nombre de usuario se perderán irrevocablemente.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Activar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>sin video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Crear archivo de respaldo aquÃ</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>¡Crea un archivo de respaldo para tu cuenta!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Cuenta de respaldo</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Eliminar conversación</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>¿Desea eliminar esta conversación?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>El nombre de usuario ya está en uso</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Cambiar contraseña actual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Crear archivo (.gz) de respaldo</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Por favor inténtalo más tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos bloqueados</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>¿Realmente deseas eliminar esta cuenta?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Por favor inténtalo más tarde.</translation>
<source>Network disconnected</source>
<translation>Red desconectada</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Por favor inténtalo más tarde.</translation>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Tu perfil solamente se comparte con tus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami se cerrará.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ se conecte para sincronizar la conversación.</translation>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ se conecte para sincronizar la conversación.</translation>
<source>You are still muted on your device</source>
<translation>TodavÃa continúas silenciada/o en tu dispositivo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ se conecte para sincronizar la conversación.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ se conecte para sincronizar la conversación.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ se conecte para sincronizar la conversación.</translation>
<source>Hide advanced settings</source>
<translation>Ocultar ajustes avanzados</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ se conecte para sincronizar la conversación.</translation>
<source>Hide banned contacts</source>
<translation>Ocultar los usuarios bloqueados</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Create your account from a backup</source>
<translation>Crear una cuenta desde un archivo de respaldo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Puedes obtener un archivo haciendo click en "Crear respaldo de la cuenta" dentro de configuración de la cuenta. Esto creará un archivo .gz en tu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Elige una imagen de avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_es_AR.ts b/translations/ring_client_windows_es_AR.ts
index b71212c53a20aa14acdb931d764310d910e45027..3b8edc63226be066603f1421d424aa8bb398459e 100644
--- a/translations/ring_client_windows_es_AR.ts
+++ b/translations/ring_client_windows_es_AR.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Videollamada entrante de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Seleccionar la tasa de cuadros de video (cuadros por segundo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Esta cuenta sólo existe en este dispositivo. Si lo perdés o desinstalás la aplicación, tu cuenta se borrará y no se podrá recuperar. Podés crear un archivo de respaldo de tu cuenta ahora o más adelante.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Crear un punto de encuentro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Elegà una contraseña para encriptar tu cuenta en este dispositivo. Tené en cuenta que la contraseña no podrá ser recuperada</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Elegir un nombre para tu punto de encuentro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si no has creado un archivo de respaldo ni has vinculado tu cuenta a otro dispositivo, tu cuenta y nombre de usuario se perderán irrevocablemente.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Habilitar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>sin video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Respaldar cuenta aquÃ</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>¡Crear copia de respaldo de tu cuenta!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Crear respaldo de la cuenta</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Eliminar conversación</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>¿Realmente quieres eliminar esta conversación?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Nombre de usuario ya en uso</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Cambiar contraseña actual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Respaldar tu cuenta en un archivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Por favor intentalo más tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos prohibidos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>¿Realmente querés eliminar esta cuenta?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Por favor intentalo más tarde.</translation>
<source>Network disconnected</source>
<translation>Red desconectada</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Por favor intentalo más tarde.</translation>
<source>Dismiss</source>
<translation>Rechazar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Tu perfil sólo es compartido con tus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami se cerrará.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ se conecte para sincronizar la conversación.</translation>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ se conecte para sincronizar la conversación.</translation>
<source>You are still muted on your device</source>
<translation>TodavÃa continuás silenciada/o en tu dispositivo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ se conecte para sincronizar la conversación.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ se conecte para sincronizar la conversación.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ se conecte para sincronizar la conversación.</translation>
<source>Hide advanced settings</source>
<translation>Ocultar ajustes avanzados</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ se conecte para sincronizar la conversación.</translation>
<source>Hide banned contacts</source>
<translation>Ocultar contactos bloqueados</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Create your account from a backup</source>
<translation>Crear una cuenta desde un archivo de respaldo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Podés obtener un archivo de respaldo haciendo click en "Crear respaldo de la cuenta" dentro de configuración de la cuenta. Esto creará un archivo .gz en tu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Elegir una imagen de avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_es_CO.ts b/translations/ring_client_windows_es_CO.ts
index 2bfa6c734d58bd70b6062187e0cb032e57f91ab7..1cc0af67040d15dceea909f73cca5dedac848c58 100644
--- a/translations/ring_client_windows_es_CO.ts
+++ b/translations/ring_client_windows_es_CO.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Videollamada entrante de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Seleccioná la tasa de cuadros de video (cuadros por segundo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Esta cuenta sólo existe en este dispositivo. Si lo perdés o desinstalás la aplicación, tu cuenta se borrará y no se podrá recuperar. Podés crear un archivo de respaldo de tu cuenta ahora o más adelante.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Crear un punto de encuentro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Elija una contraseña para encriptar tu cuenta en este dispositivo. Tenga en cuenta que la contraseña no podrá ser recuperada</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Elegà un nombre para tu punto de encuentro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si no has creado un archivo de respaldo ni has vinculado tu cuenta a otro dispositivo, tu cuenta y nombre de usuario se perderán irrevocablemente.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Habilitar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>sin video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Respaldar cuenta aquÃ</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>¡Respalde su cuenta!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Crear respaldo de la cuenta</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Eliminar conversación</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>¿Realmente quiere eliminar esta conversación?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>El nombre de usuario ya está ocupado</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Cambiar contraseña actual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Respaldar tu cuenta en un archivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Por favor intentalo más tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos bloqueados</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>¿Realmente querés eliminar esta cuenta?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Por favor intentalo más tarde.</translation>
<source>Network disconnected</source>
<translation>Red desconectada</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Por favor intentalo más tarde.</translation>
<source>Dismiss</source>
<translation>Rechazar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Tu perfil sólo es compartido con tus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami se cerrará.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ se conecte para sincronizar la conversación.</translation>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ se conecte para sincronizar la conversación.</translation>
<source>You are still muted on your device</source>
<translation>TodavÃa continúas silenciada/o en tu dispositivo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ se conecte para sincronizar la conversación.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ se conecte para sincronizar la conversación.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ se conecte para sincronizar la conversación.</translation>
<source>Hide advanced settings</source>
<translation>Ocultar ajustes avanzados</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ se conecte para sincronizar la conversación.</translation>
<source>Hide banned contacts</source>
<translation>Ocultar los usuarios bloqueados</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Create your account from a backup</source>
<translation>Crear una cuenta desde un archivo de respaldo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Puede crear un archivo pulsando «Respaldar cuenta» en la configuración de la cuenta. Esto creará un archivo .gz en su dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Elegà una imagen de avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_es_MX.ts b/translations/ring_client_windows_es_MX.ts
index 0f99bff024073d3c640269eb8ebde418bd438a6b..310dfe5e412a53338ad67ca0890c88ae9264bae0 100644
--- a/translations/ring_client_windows_es_MX.ts
+++ b/translations/ring_client_windows_es_MX.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Videollamada entrante de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Seleccioná la tasa de cuadros de video (cuadros por segundo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Esta cuenta sólo existe en este dispositivo. Si lo perdés o desinstalás la aplicación, tu cuenta se borrará y no se podrá recuperar. Podés crear un archivo de respaldo de tu cuenta ahora o más adelante.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Crear un punto de encuentro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Elija una contraseña para encriptar tu cuenta en este dispositivo. Tenga en cuenta que la contraseña no podrá ser recuperada</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Elegà un nombre para tu punto de encuentro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si no has creado un archivo de respaldo ni has vinculado tu cuenta a otro dispositivo, tu cuenta y nombre de usuario se perderán irrevocablemente.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Habilitar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>sin video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Respaldar cuenta aquÃ</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>¡Crear copia de respaldo de tu cuenta!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Crear respaldo de la cuenta</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Eliminar conversación</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>¿Realmente quiere eliminar esta conversación?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar contraseña</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>El nombre de usuario ya está en uso</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Cambiar contraseña actual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Respaldar tu cuenta en un archivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Por favor intentalo más tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos bloqueados</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>¿Realmente querés eliminar esta cuenta?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Por favor intentalo más tarde.</translation>
<source>Network disconnected</source>
<translation>Red desconectada</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Por favor intentalo más tarde.</translation>
<source>Dismiss</source>
<translation>Rechazar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Tu perfil sólo es compartido con tus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami se cerrará.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ se conecte para sincronizar la conversación.</translation>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ se conecte para sincronizar la conversación.</translation>
<source>You are still muted on your device</source>
<translation>TodavÃa continúas silenciada/o en tu dispositivo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ se conecte para sincronizar la conversación.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ se conecte para sincronizar la conversación.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ se conecte para sincronizar la conversación.</translation>
<source>Hide advanced settings</source>
<translation>Ocultar ajustes avanzados</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ se conecte para sincronizar la conversación.</translation>
<source>Hide banned contacts</source>
<translation>Ocultar los usuarios bloqueados</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Create your account from a backup</source>
<translation>Crear una cuenta desde un archivo de respaldo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Puedes obtener un archivo haciendo click en "Crear respaldo de la cuenta" dentro de configuración de la cuenta. Esto creará un archivo .gz en tu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ se conecte para sincronizar la conversación.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Elegà una imagen de avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_et.ts b/translations/ring_client_windows_et.ts
index 631076f658ca7db821249b7e0fbf7e9fbffaaee3..d5a772e0af1c0b567d808a5175a60300102de42a 100644
--- a/translations/ring_client_windows_et.ts
+++ b/translations/ring_client_windows_et.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>videot pole</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Kustuta vestlus</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index 62def761ec01f78856b1427b5f9bbe7ee5066f35..8bcd1cab19e502d46e48bc72b51e97dfce94a1f6 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>videot pole</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Kustuta vestlus</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_eu.ts b/translations/ring_client_windows_eu.ts
index dd6b323d6b2f584291197ec51d8f372c8e50b833..cb5d5a13e68221de5482217908e9b5298b89137f 100644
--- a/translations/ring_client_windows_eu.ts
+++ b/translations/ring_client_windows_eu.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Gaitu</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>ez dago bideorik</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Egin kontuaren babes-kopia</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Elkarrizketa ezabatu</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Berretsi pasahitza</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Baztertu</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Zure profila zure kontaktuekin partekatzen da soilik</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiatu</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_fa.ts b/translations/ring_client_windows_fa.ts
index db8b7cceaef2eb0933fda12ba3679551c0c54256..7ab01e3694251461c26dc2f494fdbbf8e35d742f 100644
--- a/translations/ring_client_windows_fa.ts
+++ b/translations/ring_client_windows_fa.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>تماس تصویری ورودی از {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>یک نقطه قرار ملاقات ایجاد کنید</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>یک نام برای نقطه قرار ملاقات خود انتخاب کنید</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Ùعال‌سازی</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>ویدیو موجود نیست</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>پشتیبان‌گیری از Øساب شما</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>پشتیبان‌گیری Øساب</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>ØØ°Ù Ú¯Ùتگو</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>آیا به Øذ٠این Ú¯Ùتگو مطمئن هستید؟</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1317,11 +1326,21 @@
<source>Confirm password</source>
<translation>تأیید گذرواژه</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>اختیاری</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1347,20 +1366,6 @@
<source>Username already taken</source>
<translation>نام کاربری قبلا گرÙته شده است</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1376,26 +1381,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1481,11 +1466,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1501,27 +1481,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>مخاطبان مسدود شده</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1804,6 +1763,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1929,26 +1913,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation> رد‌کردن</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>نمایه شما تنها با مخاطبانتان هم‌رسانی می‌شود</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2098,11 +2067,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>کپی</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>مخÙÛŒ سازی مخاطبان مسدود شده</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>می‌توانید با کلیک روی "پشتیبان‌گیری Øساب" در تنظیمات Øساب،یک بایگانی تهیه کنید. این کار یک پرونده ‎.gz را در دستگاه شما ایجاد می‌کند.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>برون‌ریزی</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3661,118 +3661,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts
index 39a1e980e646cad543984237d6779c2813ad2b84..134b30204c1b7ac1234a795245a671c8d69980fd 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>تماس تصویری ورودی از {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>یک نقطه قرار ملاقات ایجاد کنید</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>یک نام برای نقطه قرار ملاقات خود انتخاب کنید</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Ùعال‌سازی</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>ویدیو موجود نیست</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>پشتیبان‌گیری از Øساب شما</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>پشتیبان‌گیری Øساب</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>ØØ°Ù Ú¯Ùتگو</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>آیا به Øذ٠این Ú¯Ùتگو مطمئن هستید؟</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1317,11 +1326,21 @@
<source>Confirm password</source>
<translation>تأیید گذرواژه</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>اختیاری</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1347,20 +1366,6 @@
<source>Username already taken</source>
<translation>نام کاربری قبلا گرÙته شده است</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1376,26 +1381,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1481,11 +1466,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1501,27 +1481,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>مخاطبان مسدود شده</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1804,6 +1763,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1929,26 +1913,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation> رد‌کردن</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>نمایه شما تنها با مخاطبانتان هم‌رسانی می‌شود</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2098,11 +2067,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>کپی</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>مخÙÛŒ سازی مخاطبان مسدود شده</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>می‌توانید با کلیک روی "پشتیبان‌گیری Øساب" در تنظیمات Øساب،یک بایگانی تهیه کنید. این کار یک پرونده ‎.gz را در دستگاه شما ایجاد می‌کند.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>برون‌ریزی</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3661,118 +3661,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index 3f7e1b8445cbd8fce0e33189a13a57df28fe492f..e300ec09d3b61243dfdafa2286e1221aadb47cc5 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Saapuva videopuhelu {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Valitse videon nopeus (kuvaa sekunnissa)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Sinun tunnus on olemassa vain tällä laitteella. Jos kadotat laitteen tai poistat sovelluksen asennuksen, tunnus poistetaan eikä sitä voi palauttaa. Voit varmuuskopioida tunnuksen nyt tai myöhemmin.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Luo tapaamispaikka</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Valitse salasana, joka salaa tunnuksen tällä laitteella. Huomaa, että salasanaa ei voi palauttaa.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Valitse tapaamispaikan nimi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Jos sinun tunnusta ei ole varmuuskopioitu tai lisätty toiseen laitteeseen, tunnus ja rekisteröity nimi menetetään lopullisesti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Päällä</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>ei videota</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Varmuuskopioi tunnus täällä</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Varmuuskopioi tunnuksesi!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Varmuuskopioi tunnus</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Poista keskustelu</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Haluatko todella poistaa tämän keskustelun?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Varmista salasana</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Valinnainen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>käyttäjätunnus on varattu</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Vaihda nykyinen salasana</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Varmuuskopioi tunnus .gz-tiedostoon</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Yritä myöhemmin uudelleen.</translation>
<source>Banned contacts</source>
<translation>Estetyt yhteystiedot</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Haluatko varmasti poistaa tämän tunnuksen?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Haluatko päivittää nyt?</translation>
<source>Network disconnected</source>
<translation>Ei verkkoyhteyttä</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Haluatko päivittää nyt?</translation>
<source>Dismiss</source>
<translation>Hylkää</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profiilisi jaetaan vain sinun yhteystietojen kanssa</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami sulkeutuu nyt.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>Copy</source>
<translation>Kopioi</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>You are still muted on your device</source>
<translation>Olet edelleen mykistetty</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>Hide advanced settings</source>
<translation>Piilota lisäasetukset</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>Hide banned contacts</source>
<translation>Piilota estetyt yhteystiedot</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>Create your account from a backup</source>
<translation>Luo tunnus varmuuskopiosta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Voit tehdä pakatun varmistuksen napsauttamalla "Varmuuskopioi tunnus" Tunnuksen asetuksissa. Tämä luo gz-tiedoston laitteellesi.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ tahdistaa yhteyden keskusteluun.</translation>
<source>Export</source>
<translation>Vie</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Valitse hahmosi kuva</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Kopioi ja jaa se ystäviesi kanssa!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index 5ca7f76cc1920732dfc06bb332e156d02061c632..85a12051d542ac8faf4fc8095ffe5570b93e03b7 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -219,11 +219,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Incoming video call from {}</source>
<translation>Appel vidéo entrant de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -389,11 +384,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Select video frame rate (frames per second)</source>
<translation>Choisir la fréquence d'image vidéo (images par seconde)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -426,22 +416,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Create a rendezvous point</source>
<translation>Créer un point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Choisissez un nom pour votre point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +462,45 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Enable</source>
<translation>Activer</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +602,11 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,19 +944,19 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<translation>aucune vidéo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1082,11 +1105,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1135,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1326,21 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,24 +1366,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur déjà utilisé</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1381,26 +1381,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1486,11 +1466,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1506,28 +1481,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1610,11 +1568,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1812,6 +1765,31 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Network disconnected</source>
<translation>Le réseau est déconnecté</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1937,26 +1915,11 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Dismiss</source>
<translation>Rejeter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil n'est partagé qu'avec vos contacts</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2107,11 +2070,6 @@ Jami s’arrête.</translation>
<source>Join Jami</source>
<translation>Rejoindre Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2229,6 +2187,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Copier</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation>Sauvegarder un compte</translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2264,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>Vous êtes encore en sourdine sur votre appareil</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2274,6 +2257,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation>Merci de confirmer</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2319,11 +2312,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation>Cet identifiant n'est pas disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2334,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>Cacher les paramètres avancés</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2344,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Cacher les contacts bannis</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2529,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2599,16 +2608,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2664,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3663,120 @@ Copy and share it with your friends!</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_fr_BE.ts b/translations/ring_client_windows_fr_BE.ts
index c18020fde2aec3d8d6ae2236b9a94a1d59708528..8311e6072adf4da871815f005739cf940b893e34 100644
--- a/translations/ring_client_windows_fr_BE.ts
+++ b/translations/ring_client_windows_fr_BE.ts
@@ -219,11 +219,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Incoming video call from {}</source>
<translation>Appel vidéo entrant de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -389,11 +384,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Select video frame rate (frames per second)</source>
<translation>Choisir la fréquence d'image vidéo (images par seconde)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -426,22 +416,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Create a rendezvous point</source>
<translation>Créer un point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Choisissez un nom pour votre point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +462,45 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Enable</source>
<translation>Activé</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +602,11 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,19 +944,19 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<translation>aucune vidéo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1082,11 +1105,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1135,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1326,21 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,24 +1366,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur non-disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1381,26 +1381,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1486,11 +1466,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1506,28 +1481,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1610,11 +1568,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1812,6 +1765,31 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Network disconnected</source>
<translation>Le réseau est déconnecté</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1937,26 +1915,11 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil n'est partagé qu'avec vos contacts</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2107,11 +2070,6 @@ Jami s’arrête.</translation>
<source>Join Jami</source>
<translation>Rejoindre Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2229,6 +2187,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Copier</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2264,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>Vous êtes encore en sourdine sur votre appareil</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2274,6 +2257,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation>Merci de confirmer</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2319,11 +2312,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation>Cet identifiant n'est pas disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2334,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>Cacher les paramètres avancés</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2344,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Cacher les contacts bannis</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2529,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2599,16 +2608,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2664,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3663,120 @@ Copy and share it with your friends!</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts
index 0c3a4872ddeacc282aefdfb9e1a56bdf2391f02c..9e7a8d425eb8ffc29215e31147f8634f9252e703 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -219,11 +219,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Incoming video call from {}</source>
<translation>Appel vidéo entrant de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -389,11 +384,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Select video frame rate (frames per second)</source>
<translation>Choisir la fréquence d'image vidéo (images par seconde)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -426,22 +416,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Create a rendezvous point</source>
<translation>Créer un point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Choisissez un nom pour votre point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +462,45 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Enable</source>
<translation>Activé</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +602,11 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,19 +944,19 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<translation>aucune vidéo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1082,11 +1105,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1135,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1326,21 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,24 +1366,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur non-disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1381,26 +1381,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1486,11 +1466,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1506,28 +1481,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1610,11 +1568,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1812,6 +1765,31 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Network disconnected</source>
<translation>Le réseau est déconnecté</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1937,26 +1915,11 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil est partagé avec vos contacts uniquement</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2107,11 +2070,6 @@ Jami s’arrête.</translation>
<source>Join Jami</source>
<translation>Rejoindre Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2229,6 +2187,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Copier</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2264,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>Vous êtes encore en sourdine sur votre appareil</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2274,6 +2257,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation>Merci de confirmer</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2319,11 +2312,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation>Cet identifiant n'est pas disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2334,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>Cacher les paramètres avancés</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2344,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Cacher les contacts bannis</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2529,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2599,16 +2608,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2664,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exportation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3663,120 @@ Copy and share it with your friends!</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_fr_CH.ts b/translations/ring_client_windows_fr_CH.ts
index 76b9ca329dc1083a52df6214842bc23ea0067617..951bfa5f4e19ffbdb82768caf7da38d0c3faaac4 100644
--- a/translations/ring_client_windows_fr_CH.ts
+++ b/translations/ring_client_windows_fr_CH.ts
@@ -219,11 +219,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Incoming video call from {}</source>
<translation>Appel vidéo entrant de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -389,11 +384,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Select video frame rate (frames per second)</source>
<translation>Choisir la fréquence d'image vidéo (images par seconde)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -426,22 +416,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Create a rendezvous point</source>
<translation>Créer un point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Choisissez un nom pour votre point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +462,45 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Enable</source>
<translation>Activé</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +602,11 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,19 +944,19 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<translation>aucune vidéo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1082,11 +1105,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1135,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1326,21 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,24 +1366,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur non-disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1381,26 +1381,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1486,11 +1466,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1506,28 +1481,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1610,11 +1568,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1812,6 +1765,31 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Network disconnected</source>
<translation>Le réseau est déconnecté</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1937,26 +1915,11 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil n'est partagé qu'avec vos contacts</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2107,11 +2070,6 @@ Jami s’arrête.</translation>
<source>Join Jami</source>
<translation>Rejoindre Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2229,6 +2187,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Copier</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2264,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>Vous êtes encore en sourdine sur votre appareil</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2274,6 +2257,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation>Merci de confirmer</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2319,11 +2312,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation>Cet identifiant n'est pas disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2334,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>Cacher les paramètres avancés</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2344,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Cacher les contacts bannis</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2529,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2599,16 +2608,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2664,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3663,120 @@ Copy and share it with your friends!</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts
index 621f56026ac8c487ed74d54e6ae1891618ae61be..8b38c7bd12bf60cdda44395cc05f88f43db1e855 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -219,11 +219,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Incoming video call from {}</source>
<translation>Appel vidéo entrant de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migration vers la technologie Swarm permettra de synchroniser cette conversation sur plusieurs appareils et améliorera la fiabilité. L'historique des conversations existantes sera effacé au cours du processus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -389,11 +384,6 @@ Veuillez entrer votre mot de passe.</translation>
<source>Select video frame rate (frames per second)</source>
<translation>Choisir la fréquence d'image vidéo (images par seconde)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Votre compte n'existe que sur cet appareil. Si vous perdez votre appareil ou si vous désinstallez l'application, votre compte sera supprimé et ne pourra pas être récupéré. Vous pouvez sauvegarder votre compte maintenant ou plus tard.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -426,22 +416,11 @@ Veuillez entrer votre mot de passe.</translation>
<source>Create a rendezvous point</source>
<translation>Créer un point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Pour chiffrer votre compte sur cet appareil, choisissez un mot de passe.
-Notez que le mot de passe ne peut pas être récupéré.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Choisissez un nom pour votre point de rendez-vous</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Si votre compte n'a pas été sauvegardé ou ajouté à un autre appareil, votre compte et votre nom enregistré seront irrévocablement perdus.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +462,45 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Enable</source>
<translation>Activé</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +602,11 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami est une plateforme de communication universelle, fondée sur le respect de la vie privée, qui s'appuie sur un réseau distribué gratuit pour tous.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,19 +944,19 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<translation>aucune vidéo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faites une sauvegarde de votre compte !</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sauvegarder le compte</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1082,11 +1105,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1135,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Remove conversation</source>
<translation>Supprimer la conversation</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Êtes-vous certain de vouloir supprimer cette conversation ? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Voulez-vous vraiment bloquer la conversation ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1326,21 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Confirm password</source>
<translation>Confirmer le mot de passe</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optionnel</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,24 +1366,6 @@ Notez que le mot de passe ne peut pas être récupéré.</translation>
<source>Username already taken</source>
<translation>Nom d'utilisateur non-disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Êtes-vous certain de vouloir rejoindre Jami sans nom d'utilisateur ?
-Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce compte. </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caractères maximum
-- Caractères alphabétiques insensibles à la casse : A à Z
-- Caractères numériques : 0 à 9
-- Caractère spécial autorisé : tiret -</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1381,26 +1381,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Ce compte est créé localement</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Choisir un nom d'utilisateur est recommandé et celui-ci ne pourra pas être modifié.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Chiffrer votre compte avec un mot de passe est optionnel et celui-ci ne peut-être retrouvé.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Une image ou un surnom sont optionnels. Ils peuvent être modifiés dans les paramètres.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1486,11 +1466,6 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Change current password</source>
<translation>Changer le mot de passe courant </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sauvegarder le compte dans un fichier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1506,28 +1481,11 @@ Dans ce cas, un identifiant aléatoire de 40 caractères sera associé à ce com
<source>Customize profile</source>
<translation>Paramétrer le profile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ce profil est uniquement partagé avec les contacts de ce compte.
-Le profil peut être modifié à tout moment dans les paramètres du compte.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Chiffrer votre compte avec un mot de passe</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un compte Jami est enregistré uniquement sur cet appareil comme une archive contenant les clés de votre compte. L'accès à cette archive peut être protégé par un mot de passe.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Notez que si vous perdez votre mot de passe, il ne peut pas être récupérer !</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1610,11 +1568,6 @@ Veuillez réessayer plus tard</translation>
<source>Banned contacts</source>
<translation>Contacts bannis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Voulez-vous vraiment supprimer ce compte?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1812,6 +1765,31 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Network disconnected</source>
<translation>Le réseau est déconnecté</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1937,26 +1915,11 @@ Souhaitez-vous mettre à jour Jami maintenant ?</translation>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Ajouter une image et un surnom pour compléter votre profile</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ce profile est partagé uniquement avec vos contacts</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Votre profil n'est partagé qu'avec vos contacts</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Pourquoi devrais-je sauvegarder mon compte ?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2107,11 +2070,6 @@ Jami s’arrête.</translation>
<source>Join Jami</source>
<translation>Rejoindre Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Partagez, librement, gratuitement et en toute confidentialité avec Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2229,6 +2187,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Copier</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation>Sauvegarder un compte</translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2264,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>Vous êtes encore en sourdine sur votre appareil</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2274,6 +2257,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation>Merci de confirmer</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2319,11 +2312,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation>Cet identifiant n'est pas disponible</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Vous pouvez choisir un nom d'utilisateur pour être facilement trouvé et joint sur Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2334,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>Cacher les paramètres avancés</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2344,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Cacher les contacts bannis</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2529,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Créer votre compte à partir d'une sauvegarde</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Vous pouvez créer une archive en cliquant sur "Sauvegarder le compte" dans les paramètres de compte. Ceci créera un fichier .gz sur votre appareil.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2599,16 +2608,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation>Choisir un compte à associer</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Choisir "Associer un autre appareil"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Le NIP sera disponible pendant 10 minutes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2664,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Choisissez une image comme avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3663,120 @@ Copy and share it with your friends!</source>
<source>What does Jami mean?</source>
<translation>Que veut dire Jami ?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Le choix du nom Jami a été inspiré par le mot swahili jamii qui signifie communauté comme substantif et ensemble comme adverbe.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Que veut dire le point vert à coté de mon compte ?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un point rouge signifie que votre compte est déconnecté du réseau, il devient vert lorsqu'il est connecté.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Pourquoi dois-je sauvegarder mon compte ?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami est distribué et votre compte est uniquement stocké sur votre appareil. Si vous perdez votre mot de passe, ou vos données, vous ne pouvez pas les récupérer.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Puis-je faire un appel conférence ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Pendant un appel, vous pouvez cliquer sur "Ajouter un participant" pour rajouter un contact à votre appel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Est-ce que Jami a des discussions de groupe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Dans les paramètres, vous pouvez activer le support des Swarms (expérimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Qu'est-ce qu'un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un compte Jami est une clé de chiffrement asymétrique. Votre compte est identifié par un Jami ID, qui est une empreinte digitale de votre clé publique.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quelles informations dois-je fournir pour créer un compte Jami ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Lorsque vous créez un nouveau compte Jami, vous n'avez pas à fournir d'informations privées telles qu'une adresse électronique, une adresse ou un numéro de téléphone.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Avec Jami, votre compte est stocké dans un dossier sur votre appareil. Le mot de passe est uniquement utilisé pour crypter votre compte afin de vous protéger d'une personne ayant un accès physique à votre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Comment faire pour sauvegarder mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Dans les paramètres du compte, un bouton est disponible pour sauvegarder votre compte.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Pourquoi n'ai-je pas besoin d'utiliser un mot de passe ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Que se passe-t-il si je supprime mon compte ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Pourquoi je n'ai pas besoin d'enregistrer un nom d'utilisateur ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Si votre compte est stocké uniquement sur vos appareils et que vous supprimer votre compte sur chacun d'eux, votre compte est perdu définitivement et ne peut être récupéré.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identifiant le plus permanent et le plus sûr est votre identifiant Jami, mais comme celui-ci est difficile à utiliser pour certaines personnes, vous avez également la possibilité d'enregistrer un nom d'utilisateur.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Puis-je utiliser mon compte sur plusieurs appareils ?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Comment faire pour sauvegarder mon compte ?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Oui, vous pouvez associer votre compte à partir des paramètres, ou bien importer un fichier archive d'un autre appareil.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Que se passe-t-il si je supprime mon compte ?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_ga.ts b/translations/ring_client_windows_ga.ts
index 65f6b997f6d2bdb7274eb2f25a66a14d549fe02b..182f1d7692ba18aafb39e8e8f6c72cac1316bcd8 100644
--- a/translations/ring_client_windows_ga.ts
+++ b/translations/ring_client_windows_ga.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>nÃl fÃseán</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_gl.ts b/translations/ring_client_windows_gl.ts
index 51298d2779479a451c32d26755090c88a58db1f0..f929805eac947e03ab7ed9ffea7661d1398d0a61 100644
--- a/translations/ring_client_windows_gl.ts
+++ b/translations/ring_client_windows_gl.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Crear un punto de encontro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Escolle un nome para o teu punto de encontro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Activar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>sen vÃdeo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fai copia de apoio para a conta</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Copia de apoio da conta</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Eliminar conversa</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Tes a certeza de que queres eliminar esta conversa?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar contrasinal</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Este nome de usuaria xa está collido</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contactos excluÃdos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Desbotar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>O teu perfil só se comparte cos teus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2098,11 +2067,6 @@ Jami vai pechar.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2218,6 +2182,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2253,6 +2237,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2263,6 +2252,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2308,11 +2307,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2323,6 +2317,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2333,6 +2343,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2518,11 +2538,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Podes obter un ficheiro premendo en "Copia de Apoio da conta" nos axustes da conta. Esto creará un ficheiro .gz no teu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2588,16 +2603,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2653,11 +2658,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3660,118 +3660,118 @@ Copiao e compárteo coas túas amizades!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_gu.ts b/translations/ring_client_windows_gu.ts
index 946c512eb4569e20b89bcd42a8e1780c7ebe4315..9eedb4634d8c4a830d92aef3aacae979cd347881 100644
--- a/translations/ring_client_windows_gu.ts
+++ b/translations/ring_client_windows_gu.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>કોઈ વિડિયો નથી</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index 347aab9ea61937100a96e674c8d2e3c1a1071b6e..e3d5c58624ea0e75dafc0c75112a874baad233d0 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>×œ×œ× ×•×™×“×ו</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>העתקה</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_hi.ts b/translations/ring_client_windows_hi.ts
index 46456430685984b063b5164735c7ce19cf6d8c8e..1ab632fcc7dd3e6dda26596d4553530eb0b5041a 100644
--- a/translations/ring_client_windows_hi.ts
+++ b/translations/ring_client_windows_hi.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>कोई वीडियो नहीं</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>खारिज करे </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index e10daa193fac89d53f6e45dd4887b0bdb23bb5b6..24b24c43c60bdaa21bcec25a6b1a0a5643648026 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>कोई वीडियो नहीं</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>खारिज करे </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index d7162062cf37a65ffa602c05f5cfbaa1d864e61e..68b0bcb3a2425c53efd1b558d4a080d9e2a08d5b 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Omogući</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>nema videozapisa</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Potvrdi lozinku</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Vaš profil je podjeljen samo sa vašim kontaktima</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Izvezi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index 71dfca88d87c68457747cc9045e6736580325acb..7d1689f8847fbbc28dd4469894ba9f04c90a6424 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -78,22 +78,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Hiba történt az adattár lekérése közben</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Felismeretlen beszélgetési mód</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>Érvénytelen üzenet észlelve</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Nincs jogosultság a beszélgetési adatok frissÃtésére</translation>
</message>
</context>
<context>
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>BejövÅ‘ videohÃvás {} részérÅ‘l</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>A rajcsoportos technológiára való áttelepÃtés lehetÅ‘vé teszi ennek a beszélgetésnek az összehongolását több eszközön keresztül, és javÃtja a megbÃzhatóságot. A folyamat során az örökölt beszélgetési elÅ‘zmények törlÅ‘dnek.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Képkockasebesség kijelölése (képkocka/másodperc)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ez a fiók csak ezen az eszközön létezik. Ha elveszÃti eszközét, vagy eltávolÃtotta az alkalmazást, akkor fiókját töröljük. Biztonsági másolatot készÃthet fiókjáról most vagy késÅ‘bb.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Találkozási pont létrehozása</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Válasszon egy jelszót az eszköz fiókkulcsának titkosÃtásához. Vegye figyelembe, hogy a jelszó nem lehet helyreállÃtott.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Találkozási pont neve kiválasztása</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Ha fiókjáról nem készÃtett biztonsági másolatot, vagy nem adott hozzá egy másik eszközhöz, akkor fiókját és regisztrált nevét visszavonhatatlanul elveszÃti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Engedélyezés</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami egy univerzális kommunikációs platform, amelynek alapja a magánélet védelme, amely mindenki számára ingyenes elosztott hálózatra támaszkodik.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>nincs videó</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fiók biztonsági mentése</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Biztonsági másolat készÃtése a fiókjáról</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fiók biztonsági mentése</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Oldalán</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>Felül</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Önrejtés</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Beszélgetés törlése</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Valóban szeretné törölni ezt a csevegését?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Valóban szeretné letiltani ezt a beszélgetést?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Elrendezési beállÃtások</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Háttérszolgáltatás-hiba: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Jelszó megerÅ‘sÃtése</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Választható</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>A felhasználónév már foglalt</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Biztos benne, hogy felhasználónév nélkül szeretne csatlakozni Jami-hez?
-Ha igen, akkor csak egy véletlenszerűen generált 40 karakterű azonosÃtó kerül hozzárendelve ehhez a fiókhoz.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- Legfeljebb 32 karakter
-- Betű karakterek (A-tól Z-ig)
-- Numerikus karakterek (0–9)
-- Különleges karakter: kötőjel (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ Ha igen, akkor csak egy véletlenszerűen generált 40 karakterű azonosÃtó ke
<source>Encrypt</source>
<translation>TitkosÃtás</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Helyileg létrehozott fiók</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Válasszon felhasználónevet (nem kötelezÅ‘, de ajánlott). Felhasználónév nem módosÃtható.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Fiók titkosÃtása jelszóval (nem kötelezÅ‘). A jelszó nem állÃtható vissza.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>A kép és a becenév nem kötelezÅ‘, és a beállÃtásokban módosÃtható</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ Ha igen, akkor csak egy véletlenszerűen generált 40 karakterű azonosÃtó ke
<source>Change current password</source>
<translation>Jelszó megváltoztatása</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Biztonsági másolat készÃtése .gz fájlba</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,28 +1480,11 @@ Ha igen, akkor csak egy véletlenszerűen generált 40 karakterű azonosÃtó ke
<source>Customize profile</source>
<translation>Profil testreszabása</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ez a profil csak a fiók kapcsolattartóival van megosztva.
-A profil bármikor módosÃtható a FiókbeállÃtásokban.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Fiók titkosÃtása jelszóval</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>A Jami-fiók csak a fiók kulcsait tartalmazó archÃvumként van regisztrálva ezen az eszközön. Az archÃvumhoz való hozzáférés jelszóval védhetÅ‘.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Megjegyzés: Ha a jelszó elveszett, a fiókot nem lehet visszaállÃtani!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1608,11 +1567,6 @@ Kérjük, hogy próbálja újra később.</translation>
<source>Banned contacts</source>
<translation>Letiltott kapcsolatok</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Biztosan törli a kiválasztott fiókot?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1809,6 +1763,31 @@ Kérjük, hogy próbálja újra később.</translation>
<source>Network disconnected</source>
<translation>Hálózat leválasztva</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1934,26 +1913,11 @@ Kérjük, hogy próbálja újra később.</translation>
<source>Dismiss</source>
<translation>ElutasÃtás</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Adjon hozzá egy képet és egy becenevet a profil befejezéséhez</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Ez a profil csak a fiók kapcsolattartóival van megosztva.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>A profilja csak a kapcsolataival kerül megosztásra</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Miért szükséges elmenteni egy fiókot?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2104,11 +2068,6 @@ A Jami most kilép.</translation>
<source>Join Jami</source>
<translation>Csatlakozás Jami-hez</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Megosztás, szabadon és bizalmasan Jami-vel</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2227,6 +2186,26 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>Copy</source>
<translation>Másolás</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2262,6 +2241,11 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>You are still muted on your device</source>
<translation>Még mindig el van némÃtva az eszközén</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2272,6 +2256,16 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>Confirm action</source>
<translation>Művelet megerÅ‘sÃtése</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2317,11 +2311,6 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>The identifier is not available</source>
<translation>Az azonosÃtó nem érhetÅ‘ el</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Kiválaszthat egy felhasználónevet, hogy könnyen megtalálható és elérhető legyen a Jamin.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2332,6 +2321,22 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>Hide advanced settings</source>
<translation>Haladó beállÃtások elrejtése</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2342,6 +2347,16 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>Hide banned contacts</source>
<translation>Letiltott kapcsolatok elrejtése</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2527,11 +2542,6 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>Create your account from a backup</source>
<translation>Fiók létrehozása biztonsági másolatból</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Ha archÃvumot szeretne kapni, kattintson a fiókbeállÃtások „Fiók biztonsági mentése†elemére. Ez létrehoz egy .gz fájlt az eszközén.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2597,16 +2607,6 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>Choose the account to link</source>
<translation>Fiók kiválasztása az összekapcsoláshoz</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Válassza az „Eszköz összekapcsolása fiókhozâ€</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>A PIN-kód 10 percig elérhető lesz.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2662,11 +2662,6 @@ csatlakozzon a beszélgetés összehangolásához.</translation>
<source>Export</source>
<translation>Exportálás</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Megtestesüléskép kiválasztása</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3668,120 +3663,120 @@ Másolja ki, és ossza meg barátaival!</translation>
<source>What does Jami mean?</source>
<translation>Mit jelent a Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>A Jami névválasztást a szuahéli jamii szó ihlette, amely főnévként közösséget jelent, határozószóként pedig együtt.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Mi a zöld pont a fiókom mellett?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>A piros pont azt jelenti, hogy fiókja le van választva a hálózatról, és zöldre vált, amikor csatlakozik</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Miért szükséges biztonsági másolatot készÃteni egy fiókról?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>A Jamit úgy terjesztik, hogy a fiókadatok csak azon az eszközön tárolódnak, amelyen a fiók be van állÃtva. Ha a jelszó vagy az adatok elvesznek, a fiókot nem lehet visszaállÃtani.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>IndÃthatok konferenciahÃvást?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>HÃvás közben a „RésztvevÅ‘k hozzáadása†lehetÅ‘ségre kattintva vehet fel egy kapcsolat a hÃvásba</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Van Jaminak csoportos csevegése?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>A rajcsoportok támogatása az Ãltalános beállÃtásokban engedélyezhetÅ‘ (kÃsérleti)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Mi az a Jami-fiók?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>A Jami-fiók egy nyilvános kulcsú titkosÃtás. A fiókot Jami-azonosÃtó azonosÃtja, amely a nyilvános kulcs ujjlenyomata.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Milyen adatokat kell megadni a Jami-fiók létrehozásához?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Új Jami-fiók létrehozásakor, nem kell olyan személyes adatokat szolgáltatnia, mint cÃm, telefonszám vagy e-mail-cÃm.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Miért nem szükséges jelszót használni?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>A Jami használatával fiókja az eszközén lévÅ‘ mappában tárolódik. A jelszót csak fiókja titkosÃtására használjuk, hogy megvédjük Önt azoktól, akik fizikailag hozzáférnek az eszközéhez.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Miért nem szükséges felhasználónevet regisztrálni?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>A legállandóbb és legbiztonságosabb azonosÃtó a Jami-azonosÃtó, de mivel egyesek számára nehézkes a használata, lehetÅ‘ség van felhasználónév regisztrálására is.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Hogyan készÃthetÅ‘ biztonsági másolat egy fiókról?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>A FiókbeállÃtásokban elérhetÅ‘ egy gomb a fiók biztonsági mentéséhez.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Miért nem szükséges jelszót használni?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Mi történik a fiók törlésekor?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Miért nem szükséges felhasználónevet regisztrálni?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>A fiók csak azokon az eszközökön tárolódik, amelyek a fiókkal lettek beállÃtva. A fiók véglegesen törlÅ‘dik, és nem állÃtható vissza, ha a fiókot minden eszközrÅ‘l törli.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>A legállandóbb és legbiztonságosabb azonosÃtó a Jami-azonosÃtó, de mivel egyesek számára nehézkes a használata, lehetÅ‘ség van felhasználónév regisztrálására is.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Használható egy fiók több eszközön?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Hogyan készÃthetÅ‘ biztonsági másolat egy fiókról?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Igen, összekapcsolhatja fiókját a beállÃtásokból, vagy importálhatja a biztonsági mentést egy másik eszközre.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Mi történik a fiók törlésekor?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index bfb6f6d263c7584ed353109e50b81c51cb19fd85..f1ae046a262245fe78384b8b05ea670a61e00474 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -58,42 +58,42 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="95"/>
<source>Private</source>
- <translation type="unfinished"/>
+ <translation>Privat</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="97"/>
<source>Private group (restricted invites)</source>
- <translation type="unfinished"/>
+ <translation>Grup privat (undangan terbatas)</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="99"/>
<source>Private group</source>
- <translation type="unfinished"/>
+ <translation>Grup privat</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="101"/>
<source>Public group</source>
- <translation type="unfinished"/>
+ <translation>Grup publik</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Terjadi error saat mengambil repositori ini</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Modus percakapan tidak dikenali</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>Pesan yang tidak valid terdeteksi</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Tidak cukup otorisasi untuk memperbarui info percakapan</translation>
</message>
</context>
<context>
@@ -101,7 +101,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="38"/>
<source>Find a user or search for a conversation</source>
- <translation type="unfinished"/>
+ <translation>Temukan pengguna atau cari percakapan</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="41"/>
@@ -141,7 +141,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="72"/>
<source>Authentication required</source>
- <translation type="unfinished"/>
+ <translation>Diperlukan autentikasi</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="73"/>
@@ -218,15 +218,10 @@
<source>Incoming video call from {}</source>
<translation>Panggilan video masuk dari {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
+ <translation>Memigrasi percakapan</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="86"/>
@@ -256,7 +251,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="91"/>
<source>Select a new ringtone</source>
- <translation type="unfinished"/>
+ <translation>Pilih nada dering baru</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="101"/>
@@ -286,7 +281,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="108"/>
<source>Allow fallback on RTP</source>
- <translation type="unfinished"/>
+ <translation>Izinkan Fallback pada RTP</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="109"/>
@@ -336,7 +331,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="118"/>
<source>Audio input device selector</source>
- <translation type="unfinished"/>
+ <translation>Pemilih perangkat input audio</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="119"/>
@@ -351,17 +346,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="121"/>
<source>Select a private key</source>
- <translation type="unfinished"/>
+ <translation>Pilih kunci privat</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="122"/>
<source>Select a user certificate</source>
- <translation type="unfinished"/>
+ <translation>Pilih sertifikat pengguna</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="129"/>
<source>Registration expiration time (seconds)</source>
- <translation type="unfinished"/>
+ <translation>Waktu kedaluwarsa pendaftaran (detik)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="143"/>
@@ -376,22 +371,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="178"/>
<source>Audio and Video Settings</source>
- <translation type="unfinished"/>
+ <translation>Pengaturan Audio dan Video</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="197"/>
<source>Frames per second</source>
- <translation type="unfinished"/>
+ <translation>Frame per detik</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="198"/>
<source>Select video frame rate (frames per second)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
+ <translation>Pilih laju frame video (frame per detik)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Buat titik pertemuan</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Pilih nama untuk titik pertemuan Anda</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -464,7 +444,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="547"/>
<source>Enter the PIN from another configured Jami account. Use the "Link Another Device" feature to obtain a PIN.</source>
- <translation type="unfinished"/>
+ <translation>Masukkan PIN dari akun Jami lain yang dikonfigurasi. Gunakan fitur "Tautkan Perangkat Lain" untuk mendapatkan PIN.</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="549"/>
@@ -481,10 +461,49 @@
<source>Enable</source>
<translation>Aktifkan</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
- <translation type="unfinished"/>
+ <translation>Tampilkan atau sembunyikan preferensi</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="599"/>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>tidak ada video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Buang percakapan</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Konfirmasi kata sandi</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opsional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Nama pengguna sudah diambil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,15 +1465,10 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
- <translation type="unfinished"/>
+ <translation>Aktifkan akun</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1544,7 +1508,7 @@ The profile can be changed at all time in the account's settings.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="394"/>
<source>Register username</source>
- <translation type="unfinished"/>
+ <translation>Daftarkan nama pengguna</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="395"/>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Kontak yang diblokir</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Abaikan</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profil Anda hanya dibagikan kepada kontak Anda</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Salin</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Sembunyikan kontak yang dilarang</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2916,7 +2916,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="701"/>
<source>Enable local moderators</source>
- <translation type="unfinished"/>
+ <translation>Mengaktifkan moderator lokal</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="702"/>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ig.ts b/translations/ring_client_windows_ig.ts
index 9119ab41e7aee9d71eef8069fc23df43cbea4199..0259ddf8728c370d45a400c7e95a294b43150250 100644
--- a/translations/ring_client_windows_ig.ts
+++ b/translations/ring_client_windows_ig.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>enweghị vidiyo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index 342a2c06c19315d1d4c923a91485973c631a032d..cfbf9df18ea4f2fbcaac2479a73e445e1dde32c1 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -78,22 +78,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Si è verificato un errore durante il recupero di questo repository</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>La modalità della conversazione non è riconosciuta</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>È stato rilevato un messaggio non valido</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Non ci sono abbastanza autorizzazioni per aggiornare le informazioni sulla conversazione</translation>
</message>
</context>
<context>
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Videochiamata in arrivo da {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migrazione alla tecnologia "Gruppo" consentirà la sincronizzazione di queste conversazioni su più dispositivi e migliorerà l'affidabilità . La cronologia delle conversazioni precedenti verrà cancellata durante il processo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Seleziona la frequenza dei fotogrammi video (fotogrammi al secondo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Il tuo account esiste solo su questo dispositivo. Se perdi il tuo dispositivo o disinstalli l'applicazione, il tuo account verrà eliminato e non potrà essere recuperato. Puoi eseguire il backup del tuo account ora o più tardi.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Crea un punto di riunione</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Scegli una password per cifrare il tuo account su questo dispositivo. Nota che la password non può essere recuperata.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Scegli un nome per il tuo punto di riunione</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se non hai fatto il backup del tuo account o non l'hai collegato a un altro dispositivo, il tuo account e il tuo nome registrato saranno persi per sempre.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Attiva</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami è una piattaforma di comunicazione universale, con alla base la privacy, che si basa su una rete distribuita e libera per tutti.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>senza video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fai qui il backup dell'account</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fai il backup del tuo account!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fai il backup dell'account</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Sul lato</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>In alto</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Nascondi te stesso</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Rimuovi conversazione</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Vuoi davvero rimuovere questa conversazione?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Vuoi davvero bloccare questa conversazione?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Opzioni di disposizione</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Questo è l'errore del back-end: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Conferma password</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Facoltativo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>Nome utente già utilizzato</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sei sicuro di volerti iscrivere in Jami senza un nome utente?
-In caso affermativo, a questo account verrà assegnato solo un identificatore di 40 caratteri generato casualmente.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caratteri al massimo
-- Caratteri alfabetici (dalla A alla Z)
-- Caratteri numerici (da 0 a 9)
-- Carattere speciale autorizzato: trattino (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Encrypt</source>
<translation>Cifrare</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Questo account viene creato localmente</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Scegliere un nome utente è consigliato e non può essere modificato</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>La cifratura dell'account con una password è facoltativa e non può essere recuperata.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>L'immagine e il soprannome sono facoltativi e possono essere modificati nelle impostazioni.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Change current password</source>
<translation>Cambia la password attuale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Fai il backup dell'account su un file .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,28 +1480,11 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Customize profile</source>
<translation>Personalizza il profilo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Questo profilo è condiviso solo con i contatti di questo account.
-Il profilo può essere modificato in qualsiasi momento nelle impostazioni dell'account.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Cifrare l'account con una password</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un account Jami è registrato solo su questo dispositivo come archivio contenente le chiavi del proprio account. L'accesso a questo archivio può essere protetto da una password.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Si noti che se si perde la password non è possibile recuperarla!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1608,11 +1567,6 @@ Per favore riprova più tardi.</translation>
<source>Banned contacts</source>
<translation>Contatti bloccati</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Vuoi davvero eliminare questo account?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1810,6 +1764,31 @@ Vuoi aggiornare ora?</translation>
<source>Network disconnected</source>
<translation>Rete disconnessa</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1935,26 +1914,11 @@ Vuoi aggiornare ora?</translation>
<source>Dismiss</source>
<translation>Ignora</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Aggiungi una foto e un soprannome per completare il tuo profilo</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Questo profilo è condiviso solo con i contatti di questo account.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Il tuo profilo è condiviso solo con i tuoi contatti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Perché dovrei salvare il mio account?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2105,11 +2069,6 @@ Jami ora si chiuderà .</translation>
<source>Join Jami</source>
<translation>Usa Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Condividi, liberamente e privatamente con Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2228,6 +2187,26 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Copy</source>
<translation>Copia</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2263,6 +2242,11 @@ si connetta per sincronizzare la conversazione.</translation>
<source>You are still muted on your device</source>
<translation>Il microfono del tuo dispositivo è ancora spento</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2273,6 +2257,16 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Confirm action</source>
<translation>Conferma l'azione</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2318,11 +2312,6 @@ si connetta per sincronizzare la conversazione.</translation>
<source>The identifier is not available</source>
<translation>L'identificatore non è disponibile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Puoi scegliere un nome utente per essere facilmente trovato e contattato su Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2333,6 +2322,22 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Hide advanced settings</source>
<translation>Nascondi le impostazioni avanzate</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2343,6 +2348,16 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Hide banned contacts</source>
<translation>Nascondi i contatti bloccati</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2528,11 +2543,6 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Create your account from a backup</source>
<translation>Crea il tuo account da un backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>È possibile ottenere un archivio facendo clic su "Fai il backup dell'account" nelle impostazioni dell'account. Questo creerà un file .gz sul tuo dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2598,16 +2608,6 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Choose the account to link</source>
<translation>Scegli l'account da collegare</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Seleziona "Collega un altro dispositivo".</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Il codice PIN sarà disponibile per 10 minuti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2663,11 +2663,6 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Export</source>
<translation>Esporta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Scegli una foto profilo</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3664,120 @@ Copia e condividi con i tuoi amici!</translation>
<source>What does Jami mean?</source>
<translation>Cosa significa Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>La scelta del nome Jami è stata ispirata dalla parola Swahili "jamii", che significa comunità come sostantivo e insieme come avverbio.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Cos'è il pallino verde accanto al mio account?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un punto rosso significa che l'account è disconnesso dalla rete, mentre diventa verde quando è connesso.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Perché dovrei fare il backup del mio account?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami è distribuito e il tuo account è memorizzato solo sul tuo dispositivo. Se si perde la password o i dati, non è possibile recuperarli.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Posso fare una teleconferenza?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>In una chiamata, è possibile fare clic su "Aggiungi partecipanti" per aggiungere un contatto alla chiamata.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Jami ha chat di gruppo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Nelle impostazioni, è possibile abilitare i gruppi (sperimentale)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Che cos'è un conto Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un account Jami è una chiave di cifratura asimmetrica. Il tuo account è identificato da un ID Jami, che è un'impronta digitale della tua chiave pubblica.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quali informazioni devo fornire per creare un account Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Quando si crea un nuovo account Jami, non è necessario fornire informazioni private come e-mail, indirizzo o numero di telefono.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Perché non devo usare una password?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Con Jami, il tuo account viene memorizzato in una cartella del tuo dispositivo. La password viene utilizzata solo per cifrare l'account, al fine di proteggerlo da chi ha accesso fisico al dispositivo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Perché non devo registrare un nome utente?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identificatore più sicuro è l'ID Jami, ma poiché per alcuni è difficile da usare, è possibile registrare anche un nome utente.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Come posso fare il backup del mio account?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Nelle impostazioni dell'account è disponibile un pulsante per eseguire il backup dell'account.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Perché non devo usare una password?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Cosa succede quando elimino il mio account?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Perché non devo registrare un nome utente?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Il tuo account è memorizzato solo sui tuoi dispositivi. Se si elimina l'account da ogni dispositivo, l'account è scomparso e non è più possibile recuperarlo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identificatore più sicuro è l'ID Jami, ma poiché per alcuni è difficile da usare, è possibile registrare anche un nome utente.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Posso utilizzare il mio account su più dispositivi?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Come posso fare il backup del mio account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Sì, è possibile collegare il proprio account dalle impostazioni, oppure importare il backup su un altro dispositivo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Cosa succede quando elimino il mio account?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts
index 57d57881718f78490e4fb43d3960ba135e0a0969..ba231811503fefa65dabbf5cc54657554f00ad87 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -78,22 +78,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>Si è verificato un errore durante il recupero di questo repository</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>La modalità della conversazione non è riconosciuta</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>È stato rilevato un messaggio non valido</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Non ci sono abbastanza autorizzazioni per aggiornare le informazioni sulla conversazione</translation>
</message>
</context>
<context>
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Videochiamata in arrivo da {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>La migrazione alla tecnologia "Gruppo" consentirà la sincronizzazione di queste conversazioni su più dispositivi e migliorerà l'affidabilità . La cronologia delle conversazioni precedenti verrà cancellata durante il processo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Seleziona la frequenza dei fotogrammi video (fotogrammi al secondo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Il tuo account esiste solo su questo dispositivo. Se perdi il tuo dispositivo o disinstalli l'applicazione, il tuo account verrà eliminato e non potrà essere recuperato. Puoi eseguire il backup del tuo account ora o più tardi.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Crea un punto di riunione</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Scegli una password per cifrare il tuo account su questo dispositivo. Nota che la password non può essere recuperata.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Scegli un nome per il tuo punto di riunione</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se non hai fatto il backup del tuo account o non l'hai collegato a un altro dispositivo, il tuo account e il tuo nome registrato saranno persi per sempre.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Abilita</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami è una piattaforma di comunicazione universale, con alla base la privacy, che si basa su una rete distribuita e libera per tutti.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>senza video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fai qui il backup dell'account</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fai il backup del tuo account!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fai il backup dell'account</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Sul lato</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>In alto</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Nascondi te stesso</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Rimuovi conversazione</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Vuoi davvero rimuovere questa conversazione?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Vuoi davvero bloccare questa conversazione?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Opzioni di disposizione</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Questo è l'errore del back-end: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Conferma password</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Facoltativo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>Nome utente già utilizzato</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sei sicuro di volerti iscrivere in Jami senza un nome utente?
-In caso affermativo, a questo account verrà assegnato solo un identificatore di 40 caratteri generato casualmente.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 caratteri al massimo
-- Caratteri alfabetici (dalla A alla Z)
-- Caratteri numerici (da 0 a 9)
-- Carattere speciale autorizzato: trattino (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Encrypt</source>
<translation>Cifrare</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Questo account viene creato localmente</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Scegliere un nome utente è consigliato e non può essere modificato</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>La cifratura dell'account con una password è facoltativa e non può essere recuperata.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>L'immagine e il soprannome sono facoltativi e possono essere modificati nelle impostazioni.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Change current password</source>
<translation>Cambia la password attuale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Fai il backup dell'account su un file .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,28 +1480,11 @@ In caso affermativo, a questo account verrà assegnato solo un identificatore di
<source>Customize profile</source>
<translation>Personalizza il profilo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Questo profilo è condiviso solo con i contatti di questo account.
-Il profilo può essere modificato in qualsiasi momento nelle impostazioni dell'account.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Cifrare l'account con una password</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un account Jami è registrato solo su questo dispositivo come archivio contenente le chiavi del proprio account. L'accesso a questo archivio può essere protetto da una password.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Si noti che se si perde la password non è possibile recuperarla!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1608,11 +1567,6 @@ Per favore riprova più tardi.</translation>
<source>Banned contacts</source>
<translation>Contatti bloccati</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Vuoi davvero eliminare questo account?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1810,6 +1764,31 @@ Vuoi aggiornare ora?</translation>
<source>Network disconnected</source>
<translation>Rete disconnessa</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1935,26 +1914,11 @@ Vuoi aggiornare ora?</translation>
<source>Dismiss</source>
<translation>Ignora</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Aggiungi una foto e un soprannome per completare il tuo profilo</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Questo profilo è condiviso solo con i contatti di questo account.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Il tuo profilo è condiviso solo con i tuoi contatti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Perché dovrei salvare il mio account?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2105,11 +2069,6 @@ Jami ora si chiuderà .</translation>
<source>Join Jami</source>
<translation>Usa Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Condividi, liberamente e privatamente con Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2228,6 +2187,26 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Copy</source>
<translation>Copia</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2263,6 +2242,11 @@ si connetta per sincronizzare la conversazione.</translation>
<source>You are still muted on your device</source>
<translation>Il microfono del tuo dispositivo è ancora spento</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2273,6 +2257,16 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Confirm action</source>
<translation>Conferma l'azione</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2318,11 +2312,6 @@ si connetta per sincronizzare la conversazione.</translation>
<source>The identifier is not available</source>
<translation>L'identificatore non è disponibile</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Puoi scegliere un nome utente per essere facilmente trovato e contattato su Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2333,6 +2322,22 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Hide advanced settings</source>
<translation>Nascondi le impostazioni avanzate</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2343,6 +2348,16 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Hide banned contacts</source>
<translation>Nascondi i contatti bloccati</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2528,11 +2543,6 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Create your account from a backup</source>
<translation>Crea il tuo account da un backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>È possibile ottenere un archivio facendo clic su "Fai il backup dell'account" nelle impostazioni dell'account. Questo creerà un file .gz sul tuo dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2598,16 +2608,6 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Choose the account to link</source>
<translation>Scegli l'account da collegare</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Seleziona "Collega un altro dispositivo".</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Il codice PIN sarà disponibile per 10 minuti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2663,11 +2663,6 @@ si connetta per sincronizzare la conversazione.</translation>
<source>Export</source>
<translation>Esporta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Scegli una foto profilo</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3664,120 @@ Copia e condividi con i tuoi amici!</translation>
<source>What does Jami mean?</source>
<translation>Cosa significa Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>La scelta del nome Jami è stata ispirata dalla parola Swahili "jamii", che significa comunità come sostantivo e insieme come avverbio.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Cos'è il pallino verde accanto al mio account?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un punto rosso significa che l'account è disconnesso dalla rete, mentre diventa verde quando è connesso.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Perché dovrei fare il backup del mio account?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami è distribuito e il tuo account è memorizzato solo sul tuo dispositivo. Se si perde la password o i dati, non è possibile recuperarli.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Posso fare una teleconferenza?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>In una chiamata, è possibile fare clic su "Aggiungi partecipanti" per aggiungere un contatto alla chiamata.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Jami ha chat di gruppo?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>Nelle impostazioni, è possibile abilitare i gruppi (sperimentale)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Che cos'è un conto Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un account Jami è una chiave di cifratura asimmetrica. Il tuo account è identificato da un ID Jami, che è un'impronta digitale della tua chiave pubblica.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Quali informazioni devo fornire per creare un account Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Quando si crea un nuovo account Jami, non è necessario fornire informazioni private come e-mail, indirizzo o numero di telefono.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Perché non devo usare una password?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Con Jami, il tuo account viene memorizzato in una cartella del tuo dispositivo. La password viene utilizzata solo per cifrare l'account, al fine di proteggerlo da chi ha accesso fisico al dispositivo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Perché non devo registrare un nome utente?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>L'identificatore più sicuro è l'ID Jami, ma poiché per alcuni è difficile da usare, è possibile registrare anche un nome utente.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Come posso fare il backup del mio account?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>Nelle impostazioni dell'account è disponibile un pulsante per eseguire il backup dell'account.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Perché non devo usare una password?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Cosa succede quando elimino il mio account?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Perché non devo registrare un nome utente?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Il tuo account è memorizzato solo sui tuoi dispositivi. Se si elimina l'account da ogni dispositivo, l'account è scomparso e non è più possibile recuperarlo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>L'identificatore più sicuro è l'ID Jami, ma poiché per alcuni è difficile da usare, è possibile registrare anche un nome utente.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Posso utilizzare il mio account su più dispositivi?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Come posso fare il backup del mio account?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Sì, è possibile collegare il proprio account dalle impostazioni, oppure importare il backup su un altro dispositivo.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Cosa succede quando elimino il mio account?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index 3b6b2c8daa02d2796adb15e4829d73bd97ce12cb..dc7b3720aad96c241ea291309c1fe546ed04a829 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>å¾…åˆå®¤ã‚’作æˆ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>有効化</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>ビデオãªã—</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>アカウントをãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã—ã¦ãã ã•ã„ï¼</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>アカウントをãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>会話を削除</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>ã“ã®ä¼šè©±ã‚’退出ã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>パスワードã®å†å…¥åŠ›</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>オプション</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>ã™ã§ã«å–å¾—ã•ã‚Œã¦ã„るユーザーåã§ã™</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>追放ã•ã‚ŒãŸé€£çµ¡å…ˆ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>退出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>プãƒãƒ•ã‚£ãƒ¼ãƒ«ã¯é€£çµ¡å…ˆä»¥å¤–ã«å…±æœ‰ã•ã‚Œã¾ã›ã‚“</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>コピー</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>アカウントè¨å®šã§ã€Œã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã™ã‚‹ã€ã‚’実行ã—ã¦ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å–å¾—ã§ãã¾ã™ã€‚機器ã«.gzファイルãŒä¿å˜ã•ã‚Œã¾ã™ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>エクスãƒãƒ¼ãƒˆ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_kk.ts b/translations/ring_client_windows_kk.ts
index 28d4f45e97a52959e79322026c8f70fbcd67d4b3..c222da1e1e35e949271a27f59b40f65ac475c465 100644
--- a/translations/ring_client_windows_kk.ts
+++ b/translations/ring_client_windows_kk.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>бейне жоқ</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_kn.ts b/translations/ring_client_windows_kn.ts
index a88d5bddc343e9a3d26ab658050d0f80d7e9c28c..6544281133cab5675b9e358016e18e7e1c609613 100644
--- a/translations/ring_client_windows_kn.ts
+++ b/translations/ring_client_windows_kn.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>ವೀಡಿಯೋ ಇಲà³à²²</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ko.ts b/translations/ring_client_windows_ko.ts
index 02a47b9605a2cb50b16c052ad73fa4ce654bd60d..5b216b5d02214833940620b26a78a2c3da505e55 100644
--- a/translations/ring_client_windows_ko.ts
+++ b/translations/ring_client_windows_ko.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>비디오 ì—†ìŒ</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>암호 확ì¸</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>복사하기</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>내보내기</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index e9aa5250d785bbe32bbefe2d549faef4f87ebd7d..b4c003f47a0fcbcaba9c9236e5d87634f2b74dfe 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>비디오 ì—†ìŒ</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>암호 확ì¸</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>복사하기</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>내보내기</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index 99e1570e959eb4a9b5b14ae700d4807639ca06ce..e0162871572de510c2ad4b61304980c46b735522 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Įjungti</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>nėra vaizdo įrašo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Padaryti paskyros atsarginÄ™ kopijÄ…</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Šalinti pokalbį</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ar tikrai norite pašalinti šį pokalbį?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Patvirtinkite slaptažodį</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Naudotojo vardas jau užimtas</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Užblokuoti adresatai</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Jūsų profilis yra bendrinamas tik su jūsų adresatais</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopijuoti</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Slėpti užblokuotus adresatus</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Eksportuoti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Nukopijuokite ir dalinkitÄ—s juo su draugais!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ml.ts b/translations/ring_client_windows_ml.ts
index 2bac2c685347e8a170c2842f1f7bc43aaf543ed9..bbfb4bca1d713974796fccc837f906f73b37718e 100644
--- a/translations/ring_client_windows_ml.ts
+++ b/translations/ring_client_windows_ml.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>വീഡിയോ ഇലàµà´²</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_mn_MN.ts b/translations/ring_client_windows_mn_MN.ts
index 7bf38fcd067e3ff8ea02da4f77500bbfa95c5b4c..a8b8729e55ffeda0bbb412d3451075cad8283737 100644
--- a/translations/ring_client_windows_mn_MN.ts
+++ b/translations/ring_client_windows_mn_MN.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>видео байхгүй</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_mr.ts b/translations/ring_client_windows_mr.ts
index fcf4eb59d872c3002b59a956f99ad6b06d80af14..2f1c8862b0e674d623b77dfe55e11e29e7b8c657 100644
--- a/translations/ring_client_windows_mr.ts
+++ b/translations/ring_client_windows_mr.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>वà¥à¤¹à¤¿à¤¡à¤¿à¤“ नाही</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index 4efe001a54d4aad4d61f521a7c0d33ae8f33125c..00892fe3d04040fc5bf6d0c315427e8103e3e455 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>tiada video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Sahkan kata laluan</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Nama pengguna telah digunakan pengguna lain</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Eksport</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index 04a8a6b4e45b447eb92f87cb93c026c9938a1ed3..fc02a421eb99dcbca1968b4d7992731f328ce2da 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Innkommende videoanrop fra {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Velg videofrekvens (bilder per sekund)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Opprett møteplass</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Velg et passord for å kryptere kontoen din på denne enheten. Merk at passordet ikke kan gjenopprettes.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Velg et navn for din møteplass</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Aktivèr</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>ingen video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Sikkerhetskopier kontoen her</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Sikkerhetskopier din konto!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Sikkerhetskopier konto</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Slett samtale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ønsker du virkelig å fjerne denne samtalen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Bekreft passord</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Valgfritt</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Brukernavnet er allerede i bruk</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Endre nåværende passord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Sikkerhetskopier konto til en .gz fil</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Vennligst forsøk igjen senere.</translation>
<source>Banned contacts</source>
<translation>Blokkerte kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Ønsker du virkelig å slette denne kontoen?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Vennligst forsøk igjen senere.</translation>
<source>Network disconnected</source>
<translation>Nettverk frakoblet</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Vennligst forsøk igjen senere.</translation>
<source>Dismiss</source>
<translation>Avvis</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Din profil deles bare med dine kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami avslutter nå.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>Copy</source>
<translation>Kopier</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>Hide banned contacts</source>
<translation>Skjul blokkerte kontakter</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>Create your account from a backup</source>
<translation>Gjenopprett din konto fra en sikkerhetskopi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Du kan skaffe et arkiv ved å klikke på "Sikkerhetskopier konto" i kontoinnstillingene. Dette vil opprette en .gz-fil på enheten din.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ kobler seg til for å synkronisere samtalen.</translation>
<source>Export</source>
<translation>Eksporter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Velg et bilde som avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Kopier og del det med dine venner!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_nb_NO.ts b/translations/ring_client_windows_nb_NO.ts
index 3cc791a2fc1bef11eb9dc712b51857eff279c074..8101e417644e034d48bc48127109cdd0fa3942f4 100644
--- a/translations/ring_client_windows_nb_NO.ts
+++ b/translations/ring_client_windows_nb_NO.ts
@@ -220,11 +220,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -390,11 +385,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -427,21 +417,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +463,45 @@
<source>Enable</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +603,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,18 +945,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1082,11 +1106,6 @@
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1136,6 @@
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1327,21 @@
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,20 +1367,6 @@
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1377,26 +1382,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1482,11 +1467,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1502,27 +1482,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1604,11 +1568,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3660,118 +3660,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/ring_client_windows_ne.ts b/translations/ring_client_windows_ne.ts
index f185731fd512c095044440d3b8456506584cf0ec..a815a0ff9d1e41c612973092f1d8d8dcae66f866 100644
--- a/translations/ring_client_windows_ne.ts
+++ b/translations/ring_client_windows_ne.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>à¤à¤¿à¤¡à¤¿à¤¯à¥‹ छैन</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index 5aa9cd9d26a7c2a9de369df2e8cd3f790691f9ec..f7a265e0de149efea3e9db837d37f6dd64d34d88 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Inschakelen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>geen video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Maak een back-up van uw account!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Reservekopie van account maken</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Gesprek verwijderen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wilt u dit gesprek echt verwijderen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Bevestig wachtwoord</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optioneel</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Gebruikersnaam reeds in gebruik</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Negeren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Uw profiel wordt enkel gedeeld met uw contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Geblokkeerde contacten verbergen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exporteren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Deel deze met uw vrienden!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_nl_BE.ts b/translations/ring_client_windows_nl_BE.ts
index 1eeb0bd70cdfe778c4f2a8076e503ae82fd70150..b56e814a7843c43b5019c00b696387ccbdb7b532 100644
--- a/translations/ring_client_windows_nl_BE.ts
+++ b/translations/ring_client_windows_nl_BE.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Inschakelen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>geen video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Maak een back-up van uw account!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Back-up maken van account</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Gesprek verwijderen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wilt u dit gesprek echt verwijderen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Bevestig paswoord</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optioneel</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Gebruikersnaam reeds in gebruik</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Negeren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Uw profiel wordt enkel gedeeld met uw contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Geblokkeerde contacten verbergen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exporteren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Deel hem met uw vrienden!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts
index 48d5d6cb313cf214353e43c4e54ec61b9527e46c..c60ff1143e2ced6004d08bc3aa20a3782d344be2 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Inschakelen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>geen video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Maak een back-up van uw account!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Reservekopie van account maken</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Gesprek verwijderen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Wilt u dit gesprek echt verwijderen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Bevestig paswoord</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Optioneel</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Gebruikersnaam reeds in gebruik</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Geblokkeerde contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Negeren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Uw profiel wordt enkel gedeeld met uw contacten</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Geblokkeerde contacten verbergen</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Exporteren</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Deel hem met uw vrienden!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_nn.ts b/translations/ring_client_windows_nn.ts
index 232f703decfed5e3e6ab23d179db4b278cfe0e34..29e714c8a90d2ada8bd92f6bd14f201f1ba71f36 100644
--- a/translations/ring_client_windows_nn.ts
+++ b/translations/ring_client_windows_nn.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>ingen video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_oc.ts b/translations/ring_client_windows_oc.ts
index 6e015f3f85cd6a7f86edccd07a97e3d6ddb4324b..07117a016acd85c27502ddf734e41361c0917e3d 100644
--- a/translations/ring_client_windows_oc.ts
+++ b/translations/ring_client_windows_oc.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Salvagardatz vòstre compte !</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Suprimir discutida</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar lo senhal</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Nom d’utilizaire ja pres</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contactes forabandits</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Copiatz-lo e partejatz-lo a vòstres amics !</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 60739079579e38f194fbf16f2a5d34c6d8078718..c2c0e730a2507cd59e0bd64d08328d6a2c674f68 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>ਕੋਈ ਵੀਡਿਓ ਨਹੀਂ</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>ਆਪਣੇ ਖਾਤੇ ਦਾ ਬੈਕਅੱਪ ਲਓ!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>ਬੈਕਅੱਪ ਖਾਤਾ</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>ਮਰਜ਼ੀ ਮà©à¨¤à¨¾à¨¬à¨•</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲਿਆ ਗਿਆ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>ਖਾਰਜ ਕਰੋ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>ਤà©à¨¹à¨¾à¨¡à©€ ਪà©à¨°à©‹à¨«à¨¾à¨ˆà¨² ਸਿਰਫ਼ ਤà©à¨¹à¨¾à¨¡à©‡ ਸੰਪਰਕਾਂ ਨਾਲ ਸਾਂà¨à¨¾ ਕੀਤੀ ਜਾਂਦੀ ਹੈ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>ਨਕਲ ਲਾਹੋ</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>ਬੈਕਅੱਪ ਤੋਂ ਆਪਣਾ ਖਾਤਾ ਬਣਾਓ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index f78d0cc26a3852c57281476bac84ae5e419b222e..432653a4deda045989135f03af721edcc181640e 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Wybierz poziom odświeżania wideo (klatki na sekundę) </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Twoje konto istnieje wyłącznie na tym urządzeniu. Jeśli stracisz swoje urządzenie lub odinstalujesz aplikację, twoje konto zostanie usunięte i nie będzie możliwe jego odzyskanie. Możesz utworzyć kopię zapasową twojego konta teraz lub później.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Utwórz spotkanie</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Wybierz hasło do zaszyfrowania konta na tym urządzeniu. Pamiętaj że hasło nie będzie mogło zostać odzyskane.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Wybierz nazwÄ™ dla swojego punktu spotkania</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Jeśli twoje konto nie posiada kopii zapasowej lub nie jest obecne na innym urządzeniu, twoje konto oraz zarejestrowana nazwa zostaną bezpowrotnie utracone.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>WÅ‚Ä…cz</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>brak wideo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Zabezpiecz swoje konto tutaj</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Zabezpiecz swoje konto!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Wykonaj kopiÄ™ zapasowÄ…</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Usuń rozmowę</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Czy na pewno chcesz usunąć tą rozmowę?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Potwierdź hasło</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcjonalne</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Nazwa użytkownika zajęta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Zmień obecne hasło</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Zapisz kopiÄ™ zapasowÄ… do pliku .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Spróbuj ponownie później.</translation>
<source>Banned contacts</source>
<translation>Zablokowane kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Czy jesteś pewien, że chcesz usunąć to konto?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Spróbuj ponownie później.</translation>
<source>Network disconnected</source>
<translation>Rozłączenie z siecią</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Spróbuj ponownie później.</translation>
<source>Dismiss</source>
<translation>Odrzuć</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Twój profil jest udostępniany tylko twoim kontaktom</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Skopiuj</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Ukryj zablokowane kontakty</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Utwórz konto z kopii zapasowej</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Archiwum można uzyskać, klikając opcję „Kopia zapasowa konta†w ustawieniach konta. Spowoduje to utworzenie pliku .gz na Twoim urządzeniu.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Wyeksportuj</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Wybierz obraz jako awatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3661,118 +3661,118 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts
index 2b9f92b3f072a232d812a280c2143aae322a3de5..4b6ba7abfd8a3b2c96b0d22f7307ee8f83811d55 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Wybierz poziom odświeżania wideo (klatki na sekundę) </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Twoje konto istnieje wyłącznie na tym urządzeniu. Jeśli stracisz swoje urządzenie lub odinstalujesz aplikację, twoje konto zostanie usunięte i nie będzie możliwe jego odzyskanie. Możesz utworzyć kopię zapasową twojego konta teraz lub później.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Utwórz spotkanie</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Wybierz hasło do zaszyfrowania konta na tym urządzeniu. Pamiętaj że hasło nie będzie mogło zostać odzyskane.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Wybierz nazwÄ™ dla swojego punktu spotkania</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Jeśli twoje konto nie posiada kopii zapasowej lub nie jest obecne na innym urządzeniu, twoje konto oraz zarejestrowana nazwa zostaną bezpowrotnie utracone.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>WÅ‚Ä…cz</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>brak wideo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Zabezpiecz swoje konto tutaj</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Zabezpiecz swoje konto!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Wykonaj kopiÄ™ zapasowÄ…</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Usuń rozmowę</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Czy na pewno chcesz usunąć tą rozmowę?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Potwierdź hasło</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcjonalne</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Nazwa użytkownika zajęta</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Zmień obecne hasło</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Zapisz kopiÄ™ zapasowÄ… do pliku .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Spróbuj ponownie później.</translation>
<source>Banned contacts</source>
<translation>Zablokowane kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Czy jesteś pewien, że chcesz usunąć to konto?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Spróbuj ponownie później.</translation>
<source>Network disconnected</source>
<translation>Rozłączenie z siecią</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Spróbuj ponownie później.</translation>
<source>Dismiss</source>
<translation>Odrzuć</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Twój profil jest udostępniany tylko twoim kontaktom</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Ukryj zablokowane kontakty</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Utwórz konto z kopii zapasowej</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Archiwum można uzyskać, klikając opcję „Kopia zapasowa konta†w ustawieniach konta. Spowoduje to utworzenie pliku .gz na Twoim urządzeniu.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>Wyeksportuj</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Wybierz obraz jako awatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3661,118 +3661,118 @@ Skopiuj i podziel się nią z przyjaciółmi!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index f76b0b2263950aa2e5eef47e9670514d495dfe27..4561c1662f5c51e8f7a2c037433456602f81ee84 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Recebendo chamada de vÃdeo de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Selecione a taxa de quadros de vÃdeo (quadros por segundo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Sua conta existe apenas neste dispositivo. Se você perder seu dispositivo ou desinstalar a aplicação, sua conta será deletada e não pode ser recuperada. Você pode fazer uma cópia da sua conta agora ou depois.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Criar um ponto de encontro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Escolha uma senha para criptografar sua conta neste dispositivo. Observe que a senha não pode ser recuperada.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Escolha um nome para seu ponto de encontro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se sua conta não foi copiada ou adicionada em outro dispositivo, sua conta e nome registrado será irrevogavelmente perdida.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Ativar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>nenhum vÃdeo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Conta de backup aqui</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faça um backup da sua conta!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Conta de cópia de segurança</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Remover conversação</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Quer mesmo remover esta conversação?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar palavra-chave</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>O nome de utilizador já está registado</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Alterar a senha atual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Backup a conta para um arquivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Por favor, tente novamente mais tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos banidos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Você realmente quer excluir esta conta?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Gostaria de atualizar agora?</translation>
<source>Network disconnected</source>
<translation>Rede desconectada</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Gostaria de atualizar agora?</translation>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>O seu perfil é partilhado apenas com seus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami será finalizado agora.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ conectar para sincronizar a conversação.</translation>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ conectar para sincronizar a conversação.</translation>
<source>You are still muted on your device</source>
<translation>Você ainda está com o seu microfone desligado em seu dispositivo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ conectar para sincronizar a conversação.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ conectar para sincronizar a conversação.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ conectar para sincronizar a conversação.</translation>
<source>Hide advanced settings</source>
<translation>Ocultar as configurações avançadas</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ conectar para sincronizar a conversação.</translation>
<source>Hide banned contacts</source>
<translation>Esconder contactos banidos</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ conectar para sincronizar a conversação.</translation>
<source>Create your account from a backup</source>
<translation>Criar sua conta de um backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Você pode obter um arquivo clicando no "Backup de conta" em configurações de conta. Isto criará um arquivo .gz em seu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ conectar para sincronizar a conversação.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ conectar para sincronizar a conversação.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Escolha uma foto como avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Copie e o partilhe-o com os seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts
index 8a3a77d57df3b5dad3e4227a10286ce6d8799119..5a096dfd47a7699ba76be43fc43d2046091792f7 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Recebendo chamada de vÃdeo de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Selecione a taxa de quadros de vÃdeo (quadros por segundo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Sua conta existe apenas neste dispositivo. Se você perder seu dispositivo ou desinstalar a aplicação, sua conta será deletada e não pode ser recuperada. Você pode fazer uma cópia da sua conta agora ou depois.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Criar um ponto de encontro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Escolha uma senha para criptografar sua conta neste dispositivo. Observe que a senha não pode ser recuperada.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Escolha um nome para seu ponto de encontro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se sua conta não foi copiada ou adicionada em outro dispositivo, sua conta e nome registrado será irrevogavelmente perdida.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Habilitar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>sem vÃdeo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Conta de backup aqui</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Faça um backup da sua conta!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Cópia de segurança da conta</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Excluir uma conversa</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Você realmente quer excluir esta conversa?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar senha</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Nome de usuário já em uso</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Alterar a senha atual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Backup a conta para um arquivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Por favor, tente novamente mais tarde.</translation>
<source>Banned contacts</source>
<translation>Contatos banidos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Você realmente quer excluir esta conta?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Gostaria de atualizar agora?</translation>
<source>Network disconnected</source>
<translation>Rede desconectada</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Gostaria de atualizar agora?</translation>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Seu perfil é compartilhado apenas com seus contatos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami será finalizado agora.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ conectar para sincronizar a conversação.</translation>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ conectar para sincronizar a conversação.</translation>
<source>You are still muted on your device</source>
<translation>Você ainda está com o seu microfone desligado em seu dispositivo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ conectar para sincronizar a conversação.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ conectar para sincronizar a conversação.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ conectar para sincronizar a conversação.</translation>
<source>Hide advanced settings</source>
<translation>Ocultar as configurações avançadas</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ conectar para sincronizar a conversação.</translation>
<source>Hide banned contacts</source>
<translation>Esconder contatos banidos</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ conectar para sincronizar a conversação.</translation>
<source>Create your account from a backup</source>
<translation>Criar sua conta de um backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Você pode obter um arquivo clicando no "Backup de conta" em configurações de conta. Isto criará um arquivo .gz em seu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ conectar para sincronizar a conversação.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ conectar para sincronizar a conversação.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Escolha uma foto como avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Copie-o e compartilhe com seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_pt_PT.ts b/translations/ring_client_windows_pt_PT.ts
index b4506d2a381f144f785b9d77a2c873b44624ab8f..7b461e5f4c9227ce6aef81e83812586ba8b2d569 100644
--- a/translations/ring_client_windows_pt_PT.ts
+++ b/translations/ring_client_windows_pt_PT.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Recebendo chamada de vÃdeo de {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Selecione a taxa de quadros de vÃdeo (quadros por segundo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Sua conta existe apenas neste dispositivo. Se você perder seu dispositivo ou desinstalar a aplicação, sua conta será deletada e não pode ser recuperada. Você pode fazer uma cópia da sua conta agora ou depois.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Criar um ponto de encontro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Escolha uma senha para criptografar sua conta neste dispositivo. Observe que a senha não pode ser recuperada.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Escolha um nome para seu ponto de encontro</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Se sua conta não foi copiada ou adicionada em outro dispositivo, sua conta e nome registrado será irrevogavelmente perdida.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Ativar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>nenhum vÃdeo</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Conta de backup aqui</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fazer cópia de segurança da sua conta!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Conta de cópia de segurança</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Remover conversação</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Quer mesmo remover esta conversação?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmar palavra-chave</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opcional</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>O nome de utilizador já está registado</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Alterar a senha atual</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Backup a conta para um arquivo .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Por favor, tente novamente mais tarde.</translation>
<source>Banned contacts</source>
<translation>Contactos banidos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Você realmente quer excluir esta conta?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Gostaria de atualizar agora?</translation>
<source>Network disconnected</source>
<translation>Rede desconectada</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Gostaria de atualizar agora?</translation>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>O seu perfil é partilhado apenas com seus contactos</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami será finalizado agora.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ conectar para sincronizar a conversação.</translation>
<source>Copy</source>
<translation>Copiar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ conectar para sincronizar a conversação.</translation>
<source>You are still muted on your device</source>
<translation>Você ainda está com o seu microfone desligado em seu dispositivo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ conectar para sincronizar a conversação.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ conectar para sincronizar a conversação.</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ conectar para sincronizar a conversação.</translation>
<source>Hide advanced settings</source>
<translation>Ocultar as configurações avançadas</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ conectar para sincronizar a conversação.</translation>
<source>Hide banned contacts</source>
<translation>Esconder contactos banidos</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ conectar para sincronizar a conversação.</translation>
<source>Create your account from a backup</source>
<translation>Criar sua conta de um backup</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Você pode obter um arquivo clicando no "Backup de conta" em configurações de conta. Isto criará um arquivo .gz em seu dispositivo.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ conectar para sincronizar a conversação.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ conectar para sincronizar a conversação.</translation>
<source>Export</source>
<translation>Exportar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Escolha uma foto como avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Copie e o partilhe-o com os seus amigos!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index 12d16fd1480fc03847baf7996cf1a677315f8e16..56ed30ee02138438e62085beb680d68846824b65 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -78,22 +78,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>A apărut o eroare la obținerea acestui depozit</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Tipul conversației nu e recunoscut.</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>A fost detectat un mesaj greșit</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Autorizații insuficiente pentru actualizarea informațiilor despre conversație</translation>
</message>
</context>
<context>
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Apel video primit de la {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Migrarea la tehnologia Swarm(Grup) va permite sincronizarea acestei conversații între mai multe aparate și va îmbunătăți calitatea. Cronologia conversațiilor vechi va fi ștearsă în acest proces.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Alege frecvența video (imagini/secundă)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Acest cont există doar în acest aparat. Dacă ai pierdut aparatul sau ai dezinstalat aplicația, contul tău va fi șters și nu va putea fi recuperat. Poți face o copie de rezervă acum sau mai tîrziu.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Creează un loc de conferință</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Alege o parolă pentru a cifra contul tău în acest aparat. Reține că parola nu poate fi recuperată.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Alege un nume pentru locul de conferință</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Dacă contul tău nu a fost asociat altui aparat și nu ai o copie de rezervă, va fi pierdut definitiv împreună cu numele înscris.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Activează</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami este o platformă de comunicare universală, avînd la temelie confidențialitatea, care se bazează pe o rețea distribuită și liberă pentru oricine.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>fără video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fă aici o copie de rezervă a contului</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fă o copie de rezervă a contului!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fă o copie de rezervă</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Pe margine</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>Sus</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Ascunde-te</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Șterge conversația</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Chiar vrei să ștergi această conversație?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Chiar vrei să blochezi această conversație?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1208,17 +1217,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="294"/>
<source>Lower hand</source>
- <translation>Mîna jos</translation>
+ <translation>Coboară mîna</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="295"/>
<source>Raise hand</source>
- <translation>Mîna sus</translation>
+ <translation>Ridică mîna</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Opțiuni de aranjare</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Aceasta este eroarea din backend: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmă parola</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Facultativ</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>Nume ales deja</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sigur vrei să te înscrii în Jami fără nume de utilizator?
-Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caractere generat aleatoriu.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- maximum 32 de caractere
-- Caractere alfabetice (de la A la Z)
-- Caractere numerice (de la 0 la 9)
-- Caracter special autorizat: liniuță (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Encrypt</source>
<translation>Cifrează</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Acest cont este creat local</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Este recomandată alegerea unui nume de utilizator, care nu poate fi schimbat.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Cifrarea contului tău cu o parolă este opțională, iar aceasta nu poate fi recuperată.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Imaginea și pseudonimul sunt opționale și pot fi modificate în reglări.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Change current password</source>
<translation>Schimbă parola actuală</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Copie de rezervă a contului ca fișier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,28 +1480,11 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Customize profile</source>
<translation>Personalizează profilul</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Acest profil este împărtășit doar cu contactele acestui cont.
-Profilul poate fi modificat în orice moment în reglările contului.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Cifrează contul cu o parolă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un cont Jami este înregistrat doar în acest aparat ca o arhivă care conține cheile contului tău. Accesul la această arhivă poate fi protejat printr-o parolă.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Atenție, dacă pierzi parola, aceasta nu poate fi recuperată!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1608,11 +1567,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contacte blocate</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Chiar vrei să ștergi acest cont?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1810,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation>Rețea deconectată</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1935,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Ignoră</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Adaugă o poză și un pseudonim pentru a-ți completa profilul</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Acest profil este distribuit doar contactelor acestui cont</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profilul tău este distribuit doar contactelor tale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>De ce ar trebui să-mi salvez contul?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2105,11 +2069,6 @@ Jami se va închide acum.</translation>
<source>Join Jami</source>
<translation>Folosește Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Distribuie, în mod liber și privat, cu Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2227,6 +2186,26 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Copy</source>
<translation>Copiază</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2262,6 +2241,11 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>You are still muted on your device</source>
<translation>Microfonul aparatului tău încă este oprit</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2272,6 +2256,16 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Confirm action</source>
<translation>Confirmă acțiunea</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2317,11 +2311,6 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>The identifier is not available</source>
<translation>Identificatorul nu e disponibil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Poți alege un nume de utilizator pentru a fi ușor de găsit și de contactat pe Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2332,6 +2321,22 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Hide advanced settings</source>
<translation>Ascunde reglările avansate</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2342,6 +2347,16 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Hide banned contacts</source>
<translation>Ascunde contactele blocate</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2527,11 +2542,6 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Create your account from a backup</source>
<translation>Creează contul tău dintr-o copie de rezervă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Poți obține o arhivă făcînd clic pe „Fă o copie de rezervă a contului†în reglările contului. Asta va crea un fișier .gz în aparatul tău.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2597,16 +2607,6 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Choose the account to link</source>
<translation>Alege contul de asociat</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Alege „Asociază alt aparatâ€</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Codul PIN va fi disponibil timp de 10 minute.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2662,11 +2662,6 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Export</source>
<translation>Exportă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Alege o poză de profil</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3668,120 +3663,120 @@ Copiază-l și distribuie-l prietenilor!</translation>
<source>What does Jami mean?</source>
<translation>Ce înseamnă Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Alegerea numelui Jami a fost inspirată de cuvîntul Swahili „jamiiâ€, care înseamnă comunitate ca substantiv È™i împreună ca adverb.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Ce este punctul verde de lîngă contul meu?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un punct roșu înseamnă că acest cont este deconectat de la rețea, iar cînd este conectat devine verde.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>De ce ar trebui să fac o copie de rezervă a contului meu?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami este distribuit, iar contul tău este stocat doar în aparatul tău. Dacă pierzi parola sau datele tale, nu le poți recupera.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Pot face o teleconferință?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>În timpul unui apel, poți face clic pe „Adaugă participanți†pentru a adăuga un contact la apel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Are Jami discuții în grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>În reglări, poți activa grupurile (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Ce este un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un cont Jami este o cheie de cifrare asimetrică. Contul tău este identificat de un ID Jami, care este o amprentă a cheii tale publice.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Ce informații trebuie să furnizez pentru a crea un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Atunci cînd creezi un nou cont Jami, nu trebuie să furnizezi nicio informație privată, cum ar fi e-mailul, adresa sau numărul de telefon.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>De ce nu trebuie să folosesc o parolă?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Cu Jami, contul tău este stocat într-un dosar din aparatul tău. Parola este utilizată doar pentru a cifra contul tău, pentru a te proteja de cineva care are acces fizic la aparatul tău.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>De ce nu trebuie să înscriu un nume de utilizator?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Cel mai sigur identificator este ID-ul Jami, dar, deoarece acesta este dificil de utilizat pentru unele persoane, ai și opțiunea de a înscrie un nume de utilizator.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Cum pot face o copie de rezervă a contului meu?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>În reglările contului, este disponibil un buton pentru a face o copie de rezervă a contului.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>De ce nu trebuie să folosesc o parolă?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Ce se întîmplă dacă îmi șterg contul?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>De ce nu trebuie să înscriu un nume de utilizator?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Contul tău este stocat doar în aparatele tale. Dacă ștergi contul din fiecare aparat, contul dispare și nu îl mai poți recupera.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Cel mai sigur identificator este ID-ul Jami, dar, deoarece acesta este dificil de utilizat pentru unele persoane, ai și opțiunea de a înscrie un nume de utilizator.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Pot să-mi folosesc contul pe mai multe aparate?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Cum pot face o copie de rezervă a contului meu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Da, poți asocia contul tău din reglări sau poți importa copia de rezervă din alt aparat.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Ce se întîmplă dacă îmi șterg contul?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_ro_RO.ts b/translations/ring_client_windows_ro_RO.ts
index 4ce0e74cb01056f3ba00e8ae2ac615e06aa8e530..d70970f6c5e5456460a84c1c8d09d1eceee7814a 100644
--- a/translations/ring_client_windows_ro_RO.ts
+++ b/translations/ring_client_windows_ro_RO.ts
@@ -78,22 +78,22 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="172"/>
<source>An error occurred while fetching this repository</source>
- <translation type="unfinished"/>
+ <translation>A apărut o eroare la obținerea acestui depozit</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="174"/>
<source>The conversation's mode is un-recognized</source>
- <translation type="unfinished"/>
+ <translation>Tipul conversației nu e recunoscut.</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>A fost detectat un mesaj greșit</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
<source>Not enough authorization for updating conversation's infos</source>
- <translation type="unfinished"/>
+ <translation>Autorizații insuficiente pentru actualizarea informațiilor despre conversație</translation>
</message>
</context>
<context>
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Apel video primit de la {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Migrarea la tehnologia Swarm(Grup) va permite sincronizarea acestei conversații între mai multe aparate și va îmbunătăți calitatea. Cronologia conversațiilor vechi va fi ștearsă în acest proces.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Alege frecvența video (imagini/secundă)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Acest cont există doar în acest aparat. Dacă ai pierdut aparatul sau ai dezinstalat aplicația, contul tău va fi șters și nu va putea fi recuperat. Poți face o copie de rezervă acum sau mai târziu.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Creează un loc de conferință</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Alege o parolă pentru a cifra contul tău în acest aparat. Reține că parola nu poate fi recuperată.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Alege un nume pentru locul de conferință</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Dacă contul tău nu a fost asociat altui aparat și nu ai o copie de rezervă, va fi pierdut definitiv împreună cu numele înscris.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Activează</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami este o platformă de comunicare universală, având la temelie confidențialitatea, care se bazează pe o rețea distribuită și liberă pentru oricine.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>fără video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Fă aici o copie de rezervă a contului</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Fă o copie de rezervă a contului!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Fă o copie de rezervă</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>Pe margine</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>Sus</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>Ascunde-te</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Șterge conversația</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Chiar vrei să ștergi această conversație?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Chiar vrei să blochezi această conversație?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>Opțiuni de aranjare</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>Aceasta este eroarea din backend: %0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Confirmă parola</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Facultativ</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>Nume ales deja</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Sigur vrei să te înscrii în Jami fără nume de utilizator?
-Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caractere generat aleatoriu.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- maximum 32 de caractere
-- Caractere alfabetice (de la A la Z)
-- Caractere numerice (de la 0 la 9)
-- Caracter special autorizat: liniuță (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Encrypt</source>
<translation>Cifrează</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Acest cont este creat local</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Este recomandată alegerea unui nume de utilizator, care nu poate fi schimbat.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Cifrarea contului tău cu o parolă este opțională, iar aceasta nu poate fi recuperată.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Imaginea și pseudonimul sunt opționale și pot fi modificate în reglări.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Change current password</source>
<translation>Schimbă parola actuală</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Copie de rezervă a contului ca fișier .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,28 +1480,11 @@ Dacă da, acestui cont îi va fi atribuit doar un identificator de 40 de caracte
<source>Customize profile</source>
<translation>Personalizează profilul</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Acest profil este împărtășit doar cu contactele acestui cont.
-Profilul poate fi modificat în orice moment în reglările contului.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Cifrează contul cu o parolă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>Un cont Jami este înregistrat doar în acest aparat ca o arhivă care conține cheile contului tău. Accesul la această arhivă poate fi protejat printr-o parolă.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>Atenție, dacă pierzi parola, aceasta nu poate fi recuperată!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1608,11 +1567,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Contacte blocate</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Chiar vrei să ștergi acest cont?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1810,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation>Rețea deconectată</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1935,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Ignoră</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Adaugă o poză și un pseudonim pentru a-ți completa profilul</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Acest profil este distribuit doar contactelor acestui cont</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profilul tău este distribuit doar contactelor tale</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>De ce ar trebui să-mi salvez contul?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2105,11 +2069,6 @@ Jami se va închide acum.</translation>
<source>Join Jami</source>
<translation>Folosește Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Distribuie, în mod liber și privat, cu Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2227,6 +2186,26 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Copy</source>
<translation>Copiază</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2262,6 +2241,11 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>You are still muted on your device</source>
<translation>Microfonul aparatului tău încă este oprit</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2272,6 +2256,16 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Confirm action</source>
<translation>Confirmă acțiunea</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2317,11 +2311,6 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>The identifier is not available</source>
<translation>Identificatorul nu e disponibil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Poți alege un nume de utilizator pentru a fi ușor de găsit și de contactat pe Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2332,6 +2321,22 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Hide advanced settings</source>
<translation>Ascunde reglările avansate</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2342,6 +2347,16 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Hide banned contacts</source>
<translation>Ascunde contactele blocate</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2527,11 +2542,6 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Create your account from a backup</source>
<translation>Creează contul tău dintr-o copie de rezervă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Poți obține o arhivă făcând clic pe „Copie de rezervă a contului†în reglările contului. Asta va crea un fișier .gz în aparatul tău.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2597,16 +2607,6 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Choose the account to link</source>
<translation>Alege contul de asociat</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Alege „Asociază alt aparatâ€</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Codul PIN va fi disponibil timp de 10 minute.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2662,11 +2662,6 @@ să se conecteze pentru a sincroniza conversația.</translation>
<source>Export</source>
<translation>Exportă</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Alege o poză de profil</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3668,120 +3663,120 @@ Copiază-l și distribuie-l prietenilor!</translation>
<source>What does Jami mean?</source>
<translation>Ce înseamnă Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Alegerea numelui Jami a fost inspirată de cuvântul Swahili „jamiiâ€, care înseamnă comunitate ca substantiv È™i împreună ca adverb.</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Ce este punctul verde de lângă contul meu?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>Un punct roșu înseamnă că acest cont este deconectat de la rețea, iar când este conectat devine verde.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>De ce ar trebui să fac o copie de rezervă a contului meu?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami este distribuit, iar contul tău este stocat doar în aparatul tău. Dacă pierzi parola sau datele tale, nu le poți recupera.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Pot face o teleconferință?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>În timpul unui apel, poți face clic pe „Adaugă participanți†pentru a adăuga un contact la apel.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Are Jami discuții în grup?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>În reglări, poți activa grupurile (experimental)</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Ce este un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>Un cont Jami este o cheie de cifrare asimetrică. Contul tău este identificat de un ID Jami, care este o amprentă a cheii tale publice.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Ce informații trebuie să furnizez pentru a crea un cont Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Atunci când creezi un nou cont Jami, nu trebuie să furnizezi nicio informație privată, cum ar fi e-mailul, adresa sau numărul de telefon.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>De ce nu trebuie să folosesc o parolă?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Cu Jami, contul tău este stocat într-un dosar din aparatul tău. Parola este utilizată doar pentru a cifra contul tău, pentru a te proteja de cineva care are acces fizic la aparatul tău.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>De ce nu trebuie să înscriu un nume de utilizator?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Cel mai sigur identificator este ID-ul Jami, dar, deoarece acesta este dificil de utilizat pentru unele persoane, ai și opțiunea de a înscrie un nume de utilizator.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Cum pot face o copie de rezervă a contului meu?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>În reglările contului, este disponibil un buton pentru a face o copie de rezervă a contului.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>De ce nu trebuie să folosesc o parolă?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Ce se întâmplă dacă îmi șterg contul?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>De ce nu trebuie să înscriu un nume de utilizator?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>Contul tău este stocat doar în aparatele tale. Dacă ștergi contul din fiecare aparat, contul dispare și nu îl mai poți recupera.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Cel mai sigur identificator este ID-ul Jami, dar, deoarece acesta este dificil de utilizat pentru unele persoane, ai și opțiunea de a înscrie un nume de utilizator.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Pot să-mi folosesc contul pe mai multe aparate?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Cum pot face o copie de rezervă a contului meu?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Da, poți asocia contul tău din reglări sau poți importa copia de rezervă din alt aparat.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Ce se întâmplă dacă îmi șterg contul?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index b99e0dd6cccd8f138917081f89371fe3919752a1..078db5d559f4c9b89c1af00c1bf37c048ce7685a 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>ВходÑщий вызов от {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Выберите чаÑтоту кадров видео (кадров в Ñекунду)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ ÑущеÑтвует только на Ñтом уÑтройÑтве. ЕÑли вы потерÑете уÑтройÑтво или удалите приложение, ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ будет удалена, поÑле чего воÑÑтановить её будет невозможно. Ð’Ñ‹ можете Ñоздать резервную копию учётной запиÑи ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸Ð»Ð¸ позднее.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Создайте точку вÑтречи</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Выберите пароль Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ¹ учетной запиÑи на Ñтом уÑтройÑтве. Учтите, что пароль воÑÑтановить нельзÑ.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Выберите название Ð´Ð»Ñ Ð¼ÐµÑта вÑтречи</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>ЕÑли Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ учётной запиÑи не Ñоздана Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ, или Ñта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ не добавлена на другое уÑтройÑтво, то она, вмеÑте Ñ Ñ€ÐµÐ³Ð¸Ñтрационным именем, будет безвозвратно потерÑна.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>ЗадейÑтвовать</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>нет видео</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Резервный аккаунт здеÑÑŒ</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Создайте резервную копию!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Создать резервную копию аккаунта</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Удалить диалог</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ð’Ñ‹ дейÑтвительно хотите удалить Ñтой перепиÑку? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Подтверждение паролÑ</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>По желанию</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ занÑто</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Изменить текущий пароль</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° в .gz файл</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Заблокированные контакты</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Ð’Ñ‹ дейÑтвительно хотите удалить Ñтот аккаунт?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation>Сеть отключена</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Отклонить</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Ваш профиль доÑтупен только вашим контактам</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2222,6 +2186,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Копировать</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2257,6 +2241,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>Ð’Ñ‹ вÑе ещё отключены на вашем уÑтройÑтве</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2267,6 +2256,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2312,11 +2311,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2327,6 +2321,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>Скрыть раÑширенные наÑтройки</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2337,6 +2347,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Скрыть заблокированные контакты</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2522,11 +2542,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Создать аккаунт из резервной копии</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Ðрхив можно получить, нажав на кнопку «Резервное копирование учетной запиÑи» в наÑтройках аккаунта. Ð’ результате будет Ñоздан файл .gz на вашем уÑтройÑтве.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2592,16 +2607,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2657,11 +2662,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>ÐкÑпорт</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Выбрать изображение Ð´Ð»Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€ÐºÐ¸</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3664,118 +3664,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts
index 1a70c9ac5417cea7f62859449efa2033bed79b02..a512590c90e8fecb4e277ce5af687dd8cb3226b0 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>ВходÑщий вызов от {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Выберите чаÑтоту кадров видео (кадров в Ñекунду)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ ÑущеÑтвует только на Ñтом уÑтройÑтве. ЕÑли вы потерÑете уÑтройÑтво или удалите приложение, ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ будет удалена, поÑле чего воÑÑтановить её будет невозможно. Ð’Ñ‹ можете Ñоздать резервную копию учётной запиÑи ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸Ð»Ð¸ позднее.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Создайте точку вÑтречи</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Выберите пароль Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ¹ учетной запиÑи на Ñтом уÑтройÑтве. Учтите, что пароль воÑÑтановить нельзÑ.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Выберите название Ð´Ð»Ñ Ð¼ÐµÑта вÑтречи</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>ЕÑли Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ учётной запиÑи не Ñоздана Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ, или Ñта ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ не добавлена на другое уÑтройÑтво, то она, вмеÑте Ñ Ñ€ÐµÐ³Ð¸Ñтрационным именем, будет безвозвратно потерÑна.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Включить</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>нет видео</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Резервный аккаунт здеÑÑŒ</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Создайте резервную копию!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Удалить диалог</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ð’Ñ‹ дейÑтвительно хотите удалить Ñтой перепиÑку? </translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Подтверждение паролÑ</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>По желанию</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ занÑто</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Изменить текущий пароль</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° в .gz файл</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Заблокированные контакты</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Ð’Ñ‹ дейÑтвительно хотите удалить Ñтот аккаунт?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation>Сеть отключена</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>СброÑить</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Ваш профиль доÑтупен только Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… контактов</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami ÑÐµÐ¹Ñ‡Ð°Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ работу.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2222,6 +2186,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Копировать</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2257,6 +2241,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>Ð’Ñ‹ вÑе ещё отключены на вашем уÑтройÑтве</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2267,6 +2256,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2312,11 +2311,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2327,6 +2321,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>Скрыть раÑширенные наÑтройки</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2337,6 +2347,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Скрыть заблокированные контакты</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2522,11 +2542,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>Создать аккаунт из резервной копии</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Ðрхив можно получить, нажав на кнопку «Резервное копирование учетной запиÑи» в наÑтройках аккаунта. Ð’ результате будет Ñоздан файл .gz на вашем уÑтройÑтве.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2592,16 +2607,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2657,11 +2662,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>ÐкÑпорт</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Выбрать изображение Ð´Ð»Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€ÐºÐ¸</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3664,118 +3664,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_si.ts b/translations/ring_client_windows_si.ts
index 7f5cd29bb4fc3e91dc0b7d9bb849fb3b8f89b0ac..fa8174e6ca2d704196c628709935bd4594c35ce4 100644
--- a/translations/ring_client_windows_si.ts
+++ b/translations/ring_client_windows_si.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>වීඩියà·à·€à¶šà·Š නà·à¶</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_sk.ts b/translations/ring_client_windows_sk.ts
index 9577ba79033599d8587ab56005d3dbc7fe008142..63fee32a79f3a82c6817fdda57121dca210fd5a0 100644
--- a/translations/ring_client_windows_sk.ts
+++ b/translations/ring_client_windows_sk.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Povoliť</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>žiadne video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>ZálohovaÅ¥ váš úÄet</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>ZálohovaÅ¥ úÄet</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Odstrániť konverzáciu</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Naozaj chcete vymazať túto konverzáciu?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>PotvrÄte heslo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>PoužÃvateľské meno už je použité</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Blokované kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Odmietnuť</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Váš profil je zdieľaný iba s vašimi kontaktmi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>KopÃrovaÅ¥</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Skryť blokované kontakty</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ SkopÃrujte ho a zdieľajte s priateľmi!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index a440673dbb99a647b7e02ea8617f4ab66e116d10..8dc486eeabebdb266ff4faabe4a0f4f24c77adb5 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Povoliť</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>žiadne video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>ZálohovaÅ¥ váš úÄet</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>ZálohovaÅ¥ úÄet</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Odstrániť konverzáciu</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Naozaj chcete vymazať túto konverzáciu?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>PotvrÄte heslo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>PoužÃvateľské meno už je použité</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation>Blokované kontakty</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Odmietnuť</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Váš profil je zdieľaný iba s vašimi kontaktmi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>KopÃrovaÅ¥</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Skryť blokované kontakty</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ SkopÃrujte ho a zdieľajte s priateľmi!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index afe37692f2b25f6ac13eecac0c5aa6d8bc316e61..5ff5adebd07e7d44a9fcca67f47b4e355e78dafc 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Dohodni video klic od {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Migracija na tehnologijo jat (angl. swarm) bo omogoÄila usklajevanje tega pogovora na veÄ napravah in izboljÅ¡ala zanesljivost. Ob tem bo opuÅ¡Äena zgodovina pogovorov izbrisana.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Izberite hitrost videa (slik na sekundo)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>VaÅ¡ raÄun obstaja le na tej napravi. ÄŒe boste napravo izgubili ali odstranili program, bo vaÅ¡ raÄun izbrisan in ga ne bo mogoÄe obnoviti. VaÅ¡ raÄun lahko varnostno kopirate zdaj ali kasneje.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Ustvari toÄko sreÄevanja</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Izberite geslo za Å¡ifriranje vaÅ¡ega raÄuna na tej napravi. UpoÅ¡tevajte, da gesla ni mogoÄe obnoviti.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Izberite ime za toÄko sreÄevanja</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>ÄŒe vaÅ¡ raÄun ni bil varnostno shranjen ali dodan drugi napravi, bosta vaÅ¡ raÄun in uporabljeno ime nepovratno izgubljena.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Vklopi</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami je platforma za univerzalno komunikacijo za vsakogar, ki ima za temelj zasebnost in ki sloni na prosto distribuiranem omrežju.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>brez videoposnetka</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Tu ustvari varnostno kopijo</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Ustvarite varnostno kopijo svojega raÄuna!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Varnostno kopiranje raÄuna</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Odstrani pogovor</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Ali res želite odstraniti ta pogovor?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Ali res želite blokirati ta pogovor?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Potrdi geslo</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Izbirno</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>Uporabniško ime je že oddano</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Ali ste prepriÄani, da se želite pridružiti Jami brez uporabniÅ¡kega imena?
-ÄŒe je odgovor pozitiven, bo temu raÄunu dodeljen samo nakljuÄno tvorjen 40-znakovni identifikator.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- vsaj 32 znakov;
-- znaki angleške abecede (A to Z);
-- Å¡tevke (0 - 9);
-- dodatni posebni znak: pomišljaj (-).</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation>Å ifriraj</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>RaÄun je ustvarjen krajevno</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Izbor uporabniÅ¡kega imena je priporoÄljiv in ga ni mogoÄe spremeniti</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Å ifriranje raÄuna z geslom je neobvezno in ga ni mogoÄe obnoviti</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Slika in vzdevek nista obvezna in ju je možno spremeniti v nastavitvah.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Spremeni obstojeÄe geslo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Varnostno kopiraj raÄun v datoteko .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,28 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation>Prilagodi profil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation>Ta profil delite samo s stiki tega raÄuna.
-Profil lahko vedno spremenite prek nastavitev raÄuna.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Å ifrirajte svoj raÄun z geslom</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation>RaÄun Jami je registriran samo na tej napravi kot arhiv, ki vsebuje kljuÄe za vaÅ¡ raÄun. Dostop do tega arhiva lahko zaÅ¡Äitite z geslom.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation>UpoÅ¡tevajte, da ob izgubi gesla raÄuna ni mogoÄe obnoviti!</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1608,11 +1567,6 @@ Poskusite znova kasneje.</translation>
<source>Banned contacts</source>
<translation>Zavrnjeni stiki</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Ali res želite izbrisati ta raÄun?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1810,6 +1764,31 @@ Ali bi radi izvedli posodobitev?</translation>
<source>Network disconnected</source>
<translation>Prekinjena omrežna povezava</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1935,26 +1914,11 @@ Ali bi radi izvedli posodobitev?</translation>
<source>Dismiss</source>
<translation>Opusti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Dodajte sliko in vzdevek, da dokonÄate svoj profil</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation>Profil delite le s stiki tega raÄuna</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Vaš profil se deli samo z vašimi stiki</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation>Zakaj naj bi shranil/a svoj raÄun?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2105,11 +2069,6 @@ Jami se bo zdaj zaprl.</translation>
<source>Join Jami</source>
<translation>Pridruži se Jami</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation>Delite z drugimi, prosto in zasebno prek Jami</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2228,6 +2187,26 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2263,6 +2242,11 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>You are still muted on your device</source>
<translation>Å e vedno imate izklopljen mikrofon na svoji napravi</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2273,6 +2257,16 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>Confirm action</source>
<translation>Potrditev dejanja</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2318,11 +2312,6 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>The identifier is not available</source>
<translation>Identifikator ni na voljo</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation>Izberete lahko uporabniško ime, da bas bodo enostavno našli in dosegli v storitvi Jami.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2333,6 +2322,22 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>Hide advanced settings</source>
<translation>Skrij napredne nastavitve</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2343,6 +2348,16 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>Hide banned contacts</source>
<translation>Skrij zavrnjene stike</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2528,11 +2543,6 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>Create your account from a backup</source>
<translation>Ustvarite raÄun iz varnostne kopije</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Lahko ustvarite arhiv s klikom na "Varnostno kopiranje" na nastavitvah raÄuna. To bo na vaÅ¡i napravi ustvarilo .gz datoteko.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2598,16 +2608,6 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>Choose the account to link</source>
<translation>Izberite raÄun za povezovanje</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation>Izberite "Poveži drugo napravo"</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation>Koda PIN bo na voljo 10 minut.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2663,11 +2663,6 @@ poveže, da sinhroniziramo pogovor.</translation>
<source>Export</source>
<translation>Izvozi</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Za avatar izberi sliko</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,120 +3664,120 @@ Kopirajte ga in delite s prijatelji!</translation>
<source>What does Jami mean?</source>
<translation>Kaj pomeni Jami?</translation>
</message>
- <message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
- <translation>Izbor imena Jami je navdihnila beseda v svahiliju, jamii, ki pomeni skupnost (kot samostalnik in skupaj kot prislov).</translation>
- </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="33"/>
<source>What is the green dot next to my account?</source>
<translation>Kaj pomeni zelena pika ob mojem raÄunu?</translation>
</message>
+ <message>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
- <translation>RdeÄa pika pomeni, da vaÅ¡ raÄun ni povezan z omrežjem, v zeleno se spremeni, ko se poveže.</translation>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
- <translation>Zakaj naj bi varnostno kopiral/a svoj raÄun?</translation>
+ <source>Why should I back up my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
- <translation>Jami je distribuiran in vaÅ¡ raÄun je shranjen samo na vaÅ¡i napravi. ÄŒe izgubite geslo ali svoje podatke, ga ne morete obnoviti.</translation>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation>Ali lahko opravim konferenÄne klice?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation>Sredi klica lahko kliknete "Dodaj udeležence" in tako dodate stik h klicu</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation>Ali ima Jami skupinske klepete?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation>V nastavitvah lahko omogoÄite podporo za skupine (poskusno).</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation>Kaj je raÄun Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation>RaÄun Jami je kljuÄ za asimetriÄno Å¡ifriranje. VaÅ¡ raÄun se identificira z ID Jami, ki je prstni odtis vaÅ¡ega javnega kljuÄa.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation>Katere podatke moram podati, da ustvarjanje raÄuna Jami?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
- <translation>Ko ustvarite nov raÄun Jami, ni potrebno podati nobenih zasebnih podatkov, kot so e-naslov, naslov in telefonska Å¡tevilka.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
- <translation>Zakaj ne rabim uporabiti gesla?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
- <translation>Z Jami je vaÅ¡ raÄun shranjen v mapi na vaÅ¡i napravi. Geslo se uporablja le za Å¡ifriranje vaÅ¡ega raÄuna, da vas zaÅ¡Äiti pred drugimi, ki imajo fiziÄni dostop do vaÅ¡e naprave.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
- <translation>Zakaj ne rabim registrirati uporabniškega imena?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
- <translation>Najbolj trajen, varen identifikator je vaÅ¡ ID za Jami, a ker ta ni preveÄ prijazen do uporabnikov, imate tudi možnost registrirati uporabniÅ¡ko ime.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
- <translation>Kako lahko varnostno kopiram svoj raÄun?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
- <translation>V nastavitvah raÄuna je na voljo gumb za varnostno kopiranje vaÅ¡ega raÄuna.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
+ <translation>Zakaj ne rabim uporabiti gesla?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
- <translation>Kaj se zgodi, Äe izbriÅ¡em svoj raÄun?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
+ <translation>Zakaj ne rabim registrirati uporabniškega imena?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
- <translation>VaÅ¡ raÄun se hrani zgolj na vaÅ¡ih lastnih napravah. ÄŒe raÄun izbriÅ¡ete iz vseh naprav, je raÄun izginil in ga ne boste mogli dobiti nazaj.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <translation>Najbolj trajen, varen identifikator je vaÅ¡ ID za Jami, a ker ta ni preveÄ prijazen do uporabnikov, imate tudi možnost registrirati uporabniÅ¡ko ime.</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
- <translation>Ali lahko uporabim svoj raÄun na veÄ napravah?</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
+ <translation>Kako lahko varnostno kopiram svoj raÄun?</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
- <translation>Da, raÄun lahko povežete prek nastavitev ali pa lahko uvozite svojo varnostno kopijo na drugi napravi.</translation>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
+ <translation>Kaj se zgodi, Äe izbriÅ¡em svoj raÄun?</translation>
</message>
</context>
<context>
diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index e21305ff174a15a900ad362c0b2ef311d59460a6..a2c5caec357ebe19b6bd1e95e91672cdd4990944 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Thirrje video ardhëse prej {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation>Migrimi në teknologjinë Swarm do të lejojë njëkohësimin e kësaj bisede nëpër pajisje të shumta dhe do të përmirësojë funksionimin. Gjatë procesit do të spastrohet historiku i dikurshëm i bisedës.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Përzgjidhni shpejtësi kuadrosh video (kuadro për sekondë)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Llogaria juaj ekziston vetëm në këtë pajisje. Nëse humbni pajisjen ose çinstaloni aplikacionin, llogaria juaj do të fshihet dhe s’mund të rikthehet. Mund të bëni një kopjeruajtje të llogarisë tuaj tani ose më vonë.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Krijoni një pikë takimesh</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Zgjidhni një fjalëkalim për të fshehtëzuar llogarinë tuaj në këtë pajisje. Mbani parasysh që fjalëkalimi s’mund të rikthehet.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Zgjidhni një emër për pikën tuaj të takimeve</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Nëse llogaria juaj s’është kopjeruajtur ose shtuar te një tjetër pajisje, llogari dhe emri që keni regjistruar do të humbë në mënyrë të pakthyeshme.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Aktivizoje</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation>Jami është një platformë universale komunikimesh, me privatësinë si themel të vetin, që bazohet në një rrjet të shpërndarë për këdo.</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>nuk ka video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Kopjeruajeni llogarinë këtu</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Kopjeruani llogarinë tuaj!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Kopjeruaje llogarinë</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Hiqe bisedën</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Doni të hiqet vërtet kjo bisedë?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation>Doni të bllokoni vërtet këtë bisedë?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Ripohoni fjalëkalimin</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opsionale</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,24 +1365,6 @@
<source>Username already taken</source>
<translation>Emër përdoruesi tashmë i zënë</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation>Jeni i sigurt se doni të hyni në Jami pa një emër përdoruesi?
-Nëse po, kësaj llogarie do t’i përshoqërohet vetëm një identifikues i prodhuar kuturu prej 40 shenjash.</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation>- 32 shenja e shumta
-- Shenja alfabetike (A në Z)
-- Shenja numerike (0 në 9)
-- Shenjë speciale e autorizuar: vijë në mes (-)</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1379,26 +1380,6 @@ Nëse po, kësaj llogarie do t’i përshoqërohet vetëm një identifikues i pr
<source>Encrypt</source>
<translation>Fshehtëzoje</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation>Kjo llogatri krijohet lokalisht</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation>Zgjedhja e një emri përdoruesi është e rekomanduar dhe s’mund të ndryshohet</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation>Fshehtëzimi i llogarisë tuaj me një fjalëkalim është opsional dhe s’mund të rimerret</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation>Fotoja dhe nofka janë opsionale dhe mund të ndryshohen që nga rregullimet</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1484,11 +1465,6 @@ Nëse po, kësaj llogarie do t’i përshoqërohet vetëm një identifikues i pr
<source>Change current password</source>
<translation>Ndryshoni fjalëkalimin e tanishëm</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Kopjeruajeni llogarinë në një kartelë .gz</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1504,27 +1480,11 @@ Nëse po, kësaj llogarie do t’i përshoqërohet vetëm një identifikues i pr
<source>Customize profile</source>
<translation>Përshtatni profil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation>Fshehtëzojeni llogarinë tuaj me një fjalëkalim</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1607,11 +1567,6 @@ Ju lutemi, riprovoni më vonë.</translation>
<source>Banned contacts</source>
<translation>Kontakte të dëbuar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Doni vërtet të fshihet kjo llogari?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1809,6 +1764,31 @@ Ju lutemi, riprovoni më vonë.</translation>
<source>Network disconnected</source>
<translation>Rrjeti u shkëput</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1934,26 +1914,11 @@ Ju lutemi, riprovoni më vonë.</translation>
<source>Dismiss</source>
<translation>Hidhe Tej</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation>Shtoni një foto dhe një nofkë, që të plotësohet profili juaj</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profili juaj ndahet vetëm me kontaktet tuaja</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2104,11 +2069,6 @@ Jami tani do të mbyllet.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2227,6 +2187,26 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>Copy</source>
<translation>Kopjoje</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2262,6 +2242,11 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>You are still muted on your device</source>
<translation>Jeni ende i heshtuar në pajisjen tuaj</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2272,6 +2257,16 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2317,11 +2312,6 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>The identifier is not available</source>
<translation>Identifikuesi s’është i passhëm</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2332,6 +2322,22 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>Hide advanced settings</source>
<translation>Fshihi rregullimet e mëtejshme</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2342,6 +2348,16 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>Hide banned contacts</source>
<translation>Fshihi kontaktet e dëbuar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2527,11 +2543,6 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>Create your account from a backup</source>
<translation>Krijojeni llogarinë tuaj nga një kopjeruajtje</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Një arkiv mund ta keni duke klikuar mbi “Kopjeruani llogariâ€, te rregullime llogarie. Kjo do të krijojë në pajisjen tuaj një kartelë .gz.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2597,16 +2608,6 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2662,11 +2663,6 @@ të lidhet, për njëkohësim të bisedës.</translation>
<source>Export</source>
<translation>Eksportoje</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Zgjidhni për avatar një foto</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3669,118 +3665,118 @@ Kopjojeni dhe jepuani shokëve!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_sr.ts b/translations/ring_client_windows_sr.ts
index 0bbf33a86208b4512b407ed071b45f13834a1c74..edc53aa1e97f4a55b0f561b8d66db18777ff66fa 100644
--- a/translations/ring_client_windows_sr.ts
+++ b/translations/ring_client_windows_sr.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>nema video zapisa</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opciono</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>KorisniÄko ime je zauzeto</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Otpusti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Vaš profile je podeljen samo sa Vašim kontaktima</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_sr@Cyrl.ts b/translations/ring_client_windows_sr@Cyrl.ts
index 37dd267982dcba1c677b9cc96764c047e16d9af1..024347a60325ab1cfec4cfb4b1cc966ee31ca895 100644
--- a/translations/ring_client_windows_sr@Cyrl.ts
+++ b/translations/ring_client_windows_sr@Cyrl.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>нема видео запиÑа</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opciono</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>KorisniÄko ime je zauzeto</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Otpusti</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Vaš profile je podeljen samo sa Vašim kontaktima</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_sr_RS.ts b/translations/ring_client_windows_sr_RS.ts
index 9ec724307e27d5c9734bf082107892eada55bfcb..8ec572b9f886424c07798949eeab9a6bc86d92ec 100644
--- a/translations/ring_client_windows_sr_RS.ts
+++ b/translations/ring_client_windows_sr_RS.ts
@@ -220,11 +220,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -390,11 +385,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -427,21 +417,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +463,45 @@
<source>Enable</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +603,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,18 +945,18 @@
<translation>nema video zapisa</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1082,11 +1106,6 @@
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1136,6 @@
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1327,21 @@
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Opciono</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,20 +1367,6 @@
<source>Username already taken</source>
<translation>KorisniÄko ime je zauzeto</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1377,26 +1382,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1482,11 +1467,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1502,27 +1482,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1604,11 +1568,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3660,118 +3660,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index 9f1963f1efe10ecf107e1bb2ec64834fd62f5be1..c5a983222a8bb9f16e490a23754f8d99b653ecf5 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Inkommande videosamtal från {0}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Välj bilduppdateringsfrekvens (bilder per sekund)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Ditt konto finns endast på denna enhet. Om du förlorar enheten eller avinstallerar appen kommer ditt konto raderas och kan inte återställas. Du kan säkerhetskopiera nu eller senare. </translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Skapa en mötesplats</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Välj lösenord för att kryptera ditt konto på denna enhet. Notera att lösenordet inte kan återställas. </translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Välj namn för din Mötespunkt</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Om ditt konto inte blivit säkerhetskopierat eller lagt till på annan enhet kommer ditt konto och ditt registrerade namn att oåterkalleligen vara förlorat. </translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Aktivera</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>ingen video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Säkerhetskopiera konto här</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Säkerhetskopiera ditt konto!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Säkerhetskopiera konto</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>Ta bort konversationen</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Vill du verkligen ta bort den här konversationen?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Bekräfta lösenord</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>Valfri</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Användarnamnet finns redan</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Ändra nuvarande lösenord</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Säkerhetskopiering till en .gz fil</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Försök igen senare. </translation>
<source>Banned contacts</source>
<translation>Bannlysta kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Vill du verkligen ta bort det här kontot?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1804,6 +1763,31 @@ Försök igen senare. </translation>
<source>Network disconnected</source>
<translation>Nätverk frånkopplat</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1929,26 +1913,11 @@ Försök igen senare. </translation>
<source>Dismiss</source>
<translation>Avfärda</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Din profil delas endast med dina kontakter</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2098,11 +2067,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2221,6 +2185,26 @@ ansluter för att synkronisera konversationen. </translation>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation>Säkerhetskopiera konto</translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2256,6 +2240,11 @@ ansluter för att synkronisera konversationen. </translation>
<source>You are still muted on your device</source>
<translation>Du är fortfarande tystad på din enhet</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2266,6 +2255,16 @@ ansluter för att synkronisera konversationen. </translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2311,11 +2310,6 @@ ansluter för att synkronisera konversationen. </translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2326,6 +2320,22 @@ ansluter för att synkronisera konversationen. </translation>
<source>Hide advanced settings</source>
<translation>Dölj avancerade inställningar</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2336,6 +2346,16 @@ ansluter för att synkronisera konversationen. </translation>
<source>Hide banned contacts</source>
<translation>Dölj bannlysta kontakter</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2521,11 +2541,6 @@ ansluter för att synkronisera konversationen. </translation>
<source>Create your account from a backup</source>
<translation>Skapa konto från säkerhetskopia</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>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/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2591,16 +2606,6 @@ ansluter för att synkronisera konversationen. </translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2656,11 +2661,6 @@ ansluter för att synkronisera konversationen. </translation>
<source>Export</source>
<translation>Exportera</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Välj en bild som avatar</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3663,118 +3663,118 @@ Kopiera och dela det med dina vänner!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_sw.ts b/translations/ring_client_windows_sw.ts
index c92a601f948786e831bb4d5fe3855ff15a9c51e4..7ddeb68f7994558fc3f8ff41f5ed12d9df0ad288 100644
--- a/translations/ring_client_windows_sw.ts
+++ b/translations/ring_client_windows_sw.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>hakuna video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_ta.ts b/translations/ring_client_windows_ta.ts
index 7a84623b99b3ad8164453714e423531e3511fbed..6bfc6ca4b6fcfcf94e5df539d72530e7f3529268 100644
--- a/translations/ring_client_windows_ta.ts
+++ b/translations/ring_client_windows_ta.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>வீடியோ இலà¯à®²à¯ˆ</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_te.ts b/translations/ring_client_windows_te.ts
index 2ac531329411074498bf159d47a5e630a5795de2..a731c10ed097be449cd372f7e315a705e20e37a5 100644
--- a/translations/ring_client_windows_te.ts
+++ b/translations/ring_client_windows_te.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>వీడియో లేదà±</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_th.ts b/translations/ring_client_windows_th.ts
index 6d9621088fb6e3b8a13dd86e262a58607ca9f11c..073fc2ebe29580bce997437641bf9c2fe92e1982 100644
--- a/translations/ring_client_windows_th.ts
+++ b/translations/ring_client_windows_th.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>ไม่มีวิดีโà¸</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index a90c0969333e9ebfe303f99227ffc2c8984b5337..43a9f04d1f6b436e39c64e059257c91a1a8db0db 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation> {} 'dan gelen görüntülü arama</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>Görüntü kare sayısı seç (saniye başına kare)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>Hesabınız yalnızca bu cihazda bulunmaktadır. Cihazınızı kaybederseniz veya uygulamayı kaldırırsanız hesabınız silinir ve kurtarılamaz. Hesabınızı şimdi ya da daha sonra yedekleyebilirsiniz.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>Bir buluşma noktası oluştur</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>Bu aygıttaki hesabınızı şifrelemek için parola seçin. Parolanız kurtarılamaz, not alın.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>Buluşma noktanız için bir ad seçin</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>Hesabınız yedeklenmediyse veya başka bir aygıta eklenmediyse, hesabınız ve kayıtlı adınız geri alınamaz bir şekilde kaybolacaktır.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Etkin</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,19 +943,19 @@
<translation>video yok</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>Hesabı buraya yedekle</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>Hesabını yedekle!</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>Hesabı yedekle</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>KonuÅŸma sil</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>Bu konuşmayı gerçekten silmek istiyor musun?</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Parolayı onayla</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>İsteğe bağlı</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Kullanıcı adı önceden alınmış</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>Şimdiki parolayı değiştirin</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>Hesabı bir .gz dosyasına yedekleyin</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1603,11 +1567,6 @@ Lütfen yeniden deneyin.</translation>
<source>Banned contacts</source>
<translation>EngellenmiÅŸ KiÅŸiler</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>Gerçekten bu hesabı silmek istiyor musunuz?</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Lütfen yeniden deneyin.</translation>
<source>Network disconnected</source>
<translation>Ağ bağlı değil</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Lütfen yeniden deneyin.</translation>
<source>Dismiss</source>
<translation>Reddet</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Profiliniz yalnızca kişilerinizle paylaşılır</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2100,11 +2069,6 @@ Jami şimdi kapatılacak.</translation>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2223,6 +2187,26 @@ baÄŸlanana kadar bekleyin</translation>
<source>Copy</source>
<translation>Kopyala</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2258,6 +2242,11 @@ baÄŸlanana kadar bekleyin</translation>
<source>You are still muted on your device</source>
<translation>Hala cihazınızda sessize alındınız</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2268,6 +2257,16 @@ baÄŸlanana kadar bekleyin</translation>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2313,11 +2312,6 @@ baÄŸlanana kadar bekleyin</translation>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2328,6 +2322,22 @@ baÄŸlanana kadar bekleyin</translation>
<source>Hide advanced settings</source>
<translation>Gelişmiş ayarları gizle</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ baÄŸlanana kadar bekleyin</translation>
<source>Hide banned contacts</source>
<translation>Engellenen kiÅŸileri gizle</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2523,11 +2543,6 @@ baÄŸlanana kadar bekleyin</translation>
<source>Create your account from a backup</source>
<translation>Hesabınızı bir yedekten oluşturun</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>Hesap ayarlarında "Hesabı yedekle"ye tıklayarak arşiv edinebilirsiniz. Bu, aygıtınızda bir .gz dosyası oluşturacak.</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2593,16 +2608,6 @@ baÄŸlanana kadar bekleyin</translation>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2658,11 +2663,6 @@ baÄŸlanana kadar bekleyin</translation>
<source>Export</source>
<translation>Dışa aktar</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>Avatar olarak bir resim seçin</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3665,118 +3665,118 @@ Kopyalayın ve arkadaşlarınızla paylaşın!</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_tr_TR.ts b/translations/ring_client_windows_tr_TR.ts
index f580f85af14ea6da40f235163f739eb89dae3ac4..3015b13f769edd50d910ebae33cb0f36554f68b6 100644
--- a/translations/ring_client_windows_tr_TR.ts
+++ b/translations/ring_client_windows_tr_TR.ts
@@ -220,11 +220,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -390,11 +385,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -427,21 +417,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +463,45 @@
<source>Enable</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +603,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,18 +945,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1082,11 +1106,6 @@
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1136,6 @@
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1327,21 @@
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,20 +1367,6 @@
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1377,26 +1382,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1482,11 +1467,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1502,27 +1482,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1604,11 +1568,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3660,118 +3660,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/ring_client_windows_tt.ts b/translations/ring_client_windows_tt.ts
index 9ea37a081568d427e8a22bf4b7291663b2ba3832..f76ee95fe03241b11bfdadd479a24fc381123530 100644
--- a/translations/ring_client_windows_tt.ts
+++ b/translations/ring_client_windows_tt.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>видеоÑыз</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index ce8f22240473c522599f3dda6f1fe41902402ce4..b8dae2c63bf6eec698b137dd77726203f905399b 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation>Вхідний відео виклик від {}</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>Увімкнути</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>немає відео</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>Підтвердити пароль</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>За бажаннÑм</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача вже зайнÑто</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation>Відхилити</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>Ваш профіль бачитимуть лише ваші контакти</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>Сховати заблоковані контакти</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>ЕкÑпортувати</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3659,118 +3659,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_uk_UA.ts b/translations/ring_client_windows_uk_UA.ts
index c3bda816bd1aa5788413ce42ea97ece96ec0223e..12fd62c8fd8d2a282a8e20bfb753da5bd6f960b3 100644
--- a/translations/ring_client_windows_uk_UA.ts
+++ b/translations/ring_client_windows_uk_UA.ts
@@ -220,11 +220,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -390,11 +385,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -427,21 +417,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -483,6 +463,45 @@
<source>Enable</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -584,6 +603,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -921,18 +945,18 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1082,11 +1106,6 @@
<source>Hide self</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1117,16 +1136,6 @@
<source>Remove conversation</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1318,11 +1327,21 @@
<source>Confirm password</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1348,20 +1367,6 @@
<source>Username already taken</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1377,26 +1382,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1482,11 +1467,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1502,27 +1482,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1604,11 +1568,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1930,26 +1914,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2099,11 +2068,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2219,6 +2183,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2254,6 +2238,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2264,6 +2253,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2309,11 +2308,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2324,6 +2318,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2334,6 +2344,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2519,11 +2539,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2589,16 +2604,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2654,11 +2659,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3660,118 +3660,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/ring_client_windows_vi.ts b/translations/ring_client_windows_vi.ts
index 8b356e79417c96d438259d5e9f5f11c0cedcf54f..7b140c5e756e58b3fe1c6ac1c8272982cf45892f 100644
--- a/translations/ring_client_windows_vi.ts
+++ b/translations/ring_client_windows_vi.ts
@@ -218,11 +218,6 @@
<source>Incoming video call from {}</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -582,6 +601,11 @@
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
@@ -919,18 +943,18 @@
<translation>không có video</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1080,11 +1104,6 @@
<source>Hide self</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
<source>Cut</source>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1375,26 +1380,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1500,27 +1480,11 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
@@ -1602,11 +1566,6 @@ Please try again later.</source>
<source>Banned contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1803,6 +1762,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1928,26 +1912,11 @@ Please try again later.</source>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2097,11 +2066,6 @@ Jami will now quit.</source>
<source>Join Jami</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
@@ -2217,6 +2181,26 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
@@ -2252,6 +2236,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2262,6 +2251,16 @@ connects to synchronize the conversation.</source>
<source>Confirm action</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="274"/>
<source>Block swarm</source>
@@ -2307,11 +2306,6 @@ connects to synchronize the conversation.</source>
<source>The identifier is not available</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
<source>Display advanced settings</source>
@@ -2322,6 +2316,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2332,6 +2342,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2517,11 +2537,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2587,16 +2602,6 @@ connects to synchronize the conversation.</source>
<source>Choose the account to link</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
<source>The PIN and the account password should be entered in your device within 10 minutes.</source>
@@ -2652,11 +2657,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -3658,118 +3658,118 @@ Copy and share it with your friends!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index 0183038f241a3934bca4832fc22c23593ced3529..1874c28128e29fa66e5926ea0d732a3766130d0d 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -88,7 +88,7 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>æ£€æµ‹åˆ°æ— æ•ˆçš„æ¶ˆæ¯</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
@@ -218,15 +218,10 @@
<source>Incoming video call from {}</source>
<translation>{} 视频æ¥ç”µ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
+ <translation>转移对è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="86"/>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>选择视频帧率 (fps)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>本账户仅å˜åœ¨äºŽæ¤è®¾å¤‡ä¸Šã€‚如果您丢失了该设备或å¸è½½äº†æœ¬åº”ç”¨ï¼Œé‚£ä¹ˆæ‚¨çš„è´¦æˆ·ä¹Ÿä¼šè¢«åˆ é™¤å¹¶ä¸”æ— æ³•æ¢å¤ã€‚您å¯çŽ°åœ¨æˆ–ç¨åŽå¤‡ä»½æ‚¨çš„账户。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>创建集åˆç‚¹</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>创建密ç æ¥åŠ 密æ¤è®¾å¤‡ä¸Šçš„账户。请注æ„密ç æ— æ³•æ¢å¤ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>为您的集åˆç‚¹é€‰æ‹©ä¸€ä¸ªå称</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>å¦‚æžœæ‚¨çš„è´¦æˆ·å°šæœªå¤‡ä»½æˆ–æ·»åŠ åˆ°å…¶ä»–è®¾å¤‡ï¼Œæ‚¨çš„è´¦æˆ·å’Œå·²æ³¨å†Œå称将ä¸å¯æŒ½å›žåœ°ä¸¢å¤±ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>啟用</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -580,12 +599,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="43"/>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
+ <translation>Jami 是通用的通信平å°ï¼Œä»¥éšç§ä¸ºåŸºç¡€ï¼Œä¾èµ–于自由的分布å¼ç½‘络，为æ¯ä¸€ä¸ªäººæœåŠ¡</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation>Jami 是一个普é通信平å°ï¼Œå°Šé‡ç”¨æˆ·çš„自由与éšç§ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="64"/>
@@ -600,7 +624,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="68"/>
<source>Add to conversation</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ åˆ°å¯¹è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="69"/>
@@ -610,12 +634,12 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
<source>Certificate File (*.crt)</source>
- <translation type="unfinished"/>
+ <translation>è¯ä¹¦æ–‡ä»¶ (*.crt)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="93"/>
<source>Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</source>
- <translation type="unfinished"/>
+ <translation>音频文件 (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="96"/>
@@ -640,7 +664,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="124"/>
<source>Key File (*.key)</source>
- <translation type="unfinished"/>
+ <translation>密钥文件 (*.key)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="127"/>
@@ -919,19 +943,19 @@
<translation>æ— è§†é¢‘</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>在æ¤å¤‡ä»½è´¦æˆ·</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>備份您的帳號ï¼</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>备份账户</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>在æ—è¾¹</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>在顶部</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>éšè—自己</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>移除会è¯</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>您真的è¦åˆ 除æ¤ä¼šè¯å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>布局设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>这是æ¥è‡ªåŽç«¯çš„错误：%0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>确认密ç </translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>å¯é€‰</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>å·²å–得的使用者å稱</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1368,37 +1373,17 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="347"/>
<source>Local</source>
- <translation type="unfinished"/>
+ <translation>本地的</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="348"/>
<source>Encrypt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
+ <translation>åŠ å¯†</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
- <translation type="unfinished"/>
+ <translation>SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="357"/>
@@ -1423,7 +1408,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="361"/>
<source>Personalize account</source>
- <translation type="unfinished"/>
+ <translation>个性化账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="362"/>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>更改当å‰å¯†ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>备份账户到 .gz 文件</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1493,38 +1473,22 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
<source>Advanced account settings</source>
- <translation type="unfinished"/>
+ <translation>高级账户设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="381"/>
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
+ <translation>使用密ç åŠ å¯†æ‚¨çš„è´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
- <translation type="unfinished"/>
+ <translation>输入昵称ã€å§“æ°ã€â€¦â€¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="389"/>
@@ -1596,18 +1560,13 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="409"/>
<source>Banned</source>
- <translation type="unfinished"/>
+ <translation>å·²å±è”½</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="411"/>
<source>Banned contacts</source>
<translation>å·²å±è”½çš„è”系人</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>您确定è¦åˆ 除æ¤è´¦æˆ·å—？</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1681,7 +1640,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="435"/>
<source>Text zoom</source>
- <translation type="unfinished"/>
+ <translation>æ–‡å—缩放</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="438"/>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation>网络已æ–å¼€</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1813,17 +1797,17 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="732"/>
<source>%1 Members</source>
- <translation type="unfinished"/>
+ <translation>%1 个æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="733"/>
<source>Member</source>
- <translation type="unfinished"/>
+ <translation>æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="734"/>
<source>Documents</source>
- <translation type="unfinished"/>
+ <translation>文档</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="735"/>
@@ -1833,7 +1817,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="736"/>
<source>Add a description</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ æè¿°</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="738"/>
@@ -1843,12 +1827,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="739"/>
<source>Ignore all notifications from this conversation</source>
- <translation type="unfinished"/>
+ <translation>忽略æ¥è‡ªæ¤å¯¹è¯çš„所有æ醒</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="740"/>
<source>Choose a color</source>
- <translation type="unfinished"/>
+ <translation>选择一个颜色</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="741"/>
@@ -1858,7 +1842,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="742"/>
<source>Leave</source>
- <translation type="unfinished"/>
+ <translation>离开</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="743"/>
@@ -1883,7 +1867,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="749"/>
<source>Go to conversation</source>
- <translation type="unfinished"/>
+ <translation>å‰å¾€ä¼šè¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="750"/>
@@ -1893,63 +1877,48 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="751"/>
<source>Kick member</source>
- <translation type="unfinished"/>
+ <translation>踢出æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="752"/>
<source>Administrator</source>
- <translation type="unfinished"/>
+ <translation>管ç†å‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="753"/>
<source>Invited</source>
- <translation type="unfinished"/>
+ <translation>已邀请</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="754"/>
<source>Remove member</source>
- <translation type="unfinished"/>
+ <translation>移除æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="755"/>
<source>To:</source>
- <translation type="unfinished"/>
+ <translation>至：</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="758"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="759"/>
<source>Tips</source>
- <translation type="unfinished"/>
+ <translation>æ示</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="760"/>
<source>Dismiss</source>
<translation>解散</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>您的账户资料仅会与您的è”系人分享</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2014,7 +1983,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="566"/>
<source>Enter account's password</source>
- <translation type="unfinished"/>
+ <translation>输入账户密ç </translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="582"/>
@@ -2093,27 +2062,22 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="650"/>
<source>Configure a SIP account</source>
- <translation type="unfinished"/>
+ <translation>é…ç½® SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="654"/>
<source>Join Jami</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
+ <translation>åŠ å…¥ Jami</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
- <translation type="unfinished"/>
+ <translation>我已ç»æœ‰ä¸€ä¸ªè´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="661"/>
<source>Use existing Jami account</source>
- <translation type="unfinished"/>
+ <translation>使用现å˜çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="662"/>
@@ -2123,12 +2087,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="663"/>
<source>Share this Jami identifier to be contacted on this account!</source>
- <translation type="unfinished"/>
+ <translation>åˆ†äº«æ¤ Jami æ ‡è¯†ç¬¦ï¼Œæ¥ä¸Žè¿™ä¸ªè´¦æˆ·é€šè®¯ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="664"/>
<source>Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!</source>
- <translation type="unfinished"/>
+ <translation>è¿™é‡Œæ˜¯ä½ çš„ Jami æ ‡è¯†ç¬¦ã€‚ä¸è¦çŠ¹è±«ï¼Œåˆ†äº«å®ƒï¼Œè®©é€šè®¯æ›´æ–¹ä¾¿ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="680"/>
@@ -2223,25 +2187,45 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>複製</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation>备份å¸æˆ·</translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
- <translation type="unfinished"/>
+ <translation>Jami 归档文件 (*.gz)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="219"/>
<source>All files (*)</source>
- <translation type="unfinished"/>
+ <translation>所有文件 (*)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="236"/>
<source>Mute camera</source>
- <translation type="unfinished"/>
+ <translation>æ‘„åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="237"/>
<source>Unmute camera</source>
- <translation type="unfinished"/>
+ <translation>å–消摄åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="240"/>
@@ -2258,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>您在您的设备上ä»ç„¶è¢«é™éŸ³</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2266,6 +2255,16 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="268"/>
<source>Confirm action</source>
+ <translation>确认æ“作</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2276,7 +2275,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="275"/>
<source>Conversation details</source>
- <translation type="unfinished"/>
+ <translation>对è¯è¯¦æƒ…</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="284"/>
@@ -2291,32 +2290,27 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="314"/>
<source>Enter the Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>输入 Jami å¸å·ç®¡ç†æœåŠ¡å™¨ï¼ˆJAMS）的 URL</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="317"/>
<source>Enter JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>输入 JAMS å‡æ®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="325"/>
<source>Choose a username</source>
- <translation type="unfinished"/>
+ <translation>选择一个用户å</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="326"/>
<source>Choose an identifier</source>
- <translation type="unfinished"/>
+ <translation>é€‰æ‹©ä¸€ä¸ªæ ‡è¯†ç¬¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="327"/>
<source>The identifier is not available</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
+ <translation>è¯¥æ ‡è¯†ç¬¦ä¸å¯ç”¨</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
@@ -2328,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>éšè—高级设置</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>éšè—被å±è”½çš„è”系人</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2361,7 +2381,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="486"/>
<source>This feature is in development.</source>
- <translation type="unfinished"/>
+ <translation>æ¤åŠŸèƒ½æ£åœ¨å¼€å‘ä¸ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="490"/>
@@ -2391,7 +2411,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="497"/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"/>
+ <translation>键盘快æ·é”®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="499"/>
@@ -2523,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>从备份创建您的账户</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>您å¯åœ¨è´¦æˆ·è®¾ç½®ä¸ç‚¹å‡»â€œå¯¼å‡ºè´¦æˆ·â€èŽ·å¾—归档。这会在您的设备上创建一个以 .gz 结尾的文件。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2541,12 +2556,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="542"/>
<source>Import a Jami account from an archive file on this device.</source>
- <translation type="unfinished"/>
+ <translation>从设备上的账户档案文件导入 Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="543"/>
<source>Select archive file</source>
- <translation type="unfinished"/>
+ <translation>选择归档文件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="546"/>
@@ -2561,7 +2576,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="552"/>
<source>A PIN is required to use an existing Jami account on this device.</source>
- <translation type="unfinished"/>
+ <translation>éœ€è¦ PIN ç 以在æ¤è®¾å¤‡ä¸Šä½¿ç”¨çŽ°æœ‰çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="553"/>
@@ -2576,12 +2591,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="555"/>
<source>Step 3</source>
- <translation type="unfinished"/>
+ <translation>第3æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="556"/>
<source>Step 4</source>
- <translation type="unfinished"/>
+ <translation>第4æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="557"/>
@@ -2591,17 +2606,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="558"/>
<source>Choose the account to link</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
+ <translation>选择è¦è¿žæŽ¥çš„账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
@@ -2658,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>輸出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>选择图片作为头åƒ</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2676,7 +2676,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="585"/>
<source>Image Files (*.png *.jpg *.jpeg)</source>
- <translation type="unfinished"/>
+ <translation>图åƒæ–‡ä»¶ (*.png *.jpg *.jpeg)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="589"/>
@@ -2696,7 +2696,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="592"/>
<source>Reset Preferences</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å好设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="593"/>
@@ -2716,22 +2716,22 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="596"/>
<source>Are you sure you wish to reset %1 preferences?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦é‡ç½®%1å好设置å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="597"/>
<source>Are you sure you wish to uninstall %1?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦å¸è½½ %1 å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="604"/>
<source>Display or hide General plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—通用æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="605"/>
<source>Display or hide Account plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—账户æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="606"/>
@@ -2741,7 +2741,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="607"/>
<source>Plugin Files (*.jpl)</source>
- <translation type="unfinished"/>
+ <translation>æ’件文件 (*.jpl)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="608"/>
@@ -2751,7 +2751,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="609"/>
<source>Select An Image to %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 选择图片</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="610"/>
@@ -2766,7 +2766,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="612"/>
<source>Choose Plugin</source>
- <translation type="unfinished"/>
+ <translation>选择æ’件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="616"/>
@@ -2816,7 +2816,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="632"/>
<source>Screen %1</source>
- <translation type="unfinished"/>
+ <translation>å±å¹• %1</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="635"/>
@@ -2848,7 +2848,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="644"/>
<source>Import from an archive backup</source>
- <translation type="unfinished"/>
+ <translation>从归档备份导入</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="645"/>
@@ -2981,17 +2981,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="69"/>
<source>Increase font size</source>
- <translation type="unfinished"/>
+ <translation>å¢žåŠ å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="73"/>
<source>Decrease font size</source>
- <translation type="unfinished"/>
+ <translation>å‡å°‘å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="77"/>
<source>Reset font size</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="86"/>
@@ -3657,126 +3657,126 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/tipsmodel.cpp" line="25"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="27"/>
<source>What does Jami mean?</source>
- <translation type="unfinished"/>
+ <translation>Jami 有何å«ä¹‰ï¼Ÿ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index c8d09fd753b4035a0a15b7c10815ec8adafebe7f..d72b0faa5db975485c8a594f82de36cf0e842b22 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -88,7 +88,7 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>æ£€æµ‹åˆ°æ— æ•ˆçš„æ¶ˆæ¯</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
@@ -218,15 +218,10 @@
<source>Incoming video call from {}</source>
<translation>{} 视频æ¥ç”µ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
+ <translation>转移对è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="86"/>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>选择视频帧率 (fps)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>本账户仅å˜åœ¨äºŽæ¤è®¾å¤‡ä¸Šã€‚如果您丢失了该设备或å¸è½½äº†æœ¬åº”ç”¨ï¼Œé‚£ä¹ˆæ‚¨çš„è´¦æˆ·ä¹Ÿä¼šè¢«åˆ é™¤å¹¶ä¸”æ— æ³•æ¢å¤ã€‚您å¯çŽ°åœ¨æˆ–ç¨åŽå¤‡ä»½æ‚¨çš„账户。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>创建集åˆç‚¹</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>创建密ç æ¥åŠ 密æ¤è®¾å¤‡ä¸Šçš„账户。请注æ„密ç æ— æ³•æ¢å¤ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>为您的集åˆç‚¹é€‰æ‹©ä¸€ä¸ªå称</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>å¦‚æžœæ‚¨çš„è´¦æˆ·å°šæœªå¤‡ä»½æˆ–æ·»åŠ åˆ°å…¶ä»–è®¾å¤‡ï¼Œæ‚¨çš„è´¦æˆ·å’Œå·²æ³¨å†Œå称将ä¸å¯æŒ½å›žåœ°ä¸¢å¤±ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>å¯ç”¨</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -580,12 +599,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="43"/>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
+ <translation>Jami 是通用的通信平å°ï¼Œä»¥éšç§ä¸ºåŸºç¡€ï¼Œä¾èµ–于自由的分布å¼ç½‘络，为æ¯ä¸€ä¸ªäººæœåŠ¡</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation>Jami 是一个普é通信平å°ï¼Œå°Šé‡ç”¨æˆ·çš„自由与éšç§ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="64"/>
@@ -600,7 +624,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="68"/>
<source>Add to conversation</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ åˆ°å¯¹è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="69"/>
@@ -610,12 +634,12 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
<source>Certificate File (*.crt)</source>
- <translation type="unfinished"/>
+ <translation>è¯ä¹¦æ–‡ä»¶ (*.crt)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="93"/>
<source>Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</source>
- <translation type="unfinished"/>
+ <translation>音频文件 (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="96"/>
@@ -640,7 +664,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="124"/>
<source>Key File (*.key)</source>
- <translation type="unfinished"/>
+ <translation>密钥文件 (*.key)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="127"/>
@@ -919,19 +943,19 @@
<translation>æ— è§†é¢‘</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>在æ¤å¤‡ä»½è´¦æˆ·</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>备份您的账户ï¼</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>备份账户</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>在æ—è¾¹</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>在顶部</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>éšè—自己</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>移除会è¯</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>您真的è¦åˆ 除æ¤ä¼šè¯å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>布局设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>这是æ¥è‡ªåŽç«¯çš„错误：%0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>确认密ç </translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>å¯é€‰</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>用户å已被å 用</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1368,37 +1373,17 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="347"/>
<source>Local</source>
- <translation type="unfinished"/>
+ <translation>本地的</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="348"/>
<source>Encrypt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
+ <translation>åŠ å¯†</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
- <translation type="unfinished"/>
+ <translation>SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="357"/>
@@ -1423,7 +1408,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="361"/>
<source>Personalize account</source>
- <translation type="unfinished"/>
+ <translation>个性化账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="362"/>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>更改当å‰å¯†ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>备份账户到 .gz 文件</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1493,38 +1473,22 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
<source>Advanced account settings</source>
- <translation type="unfinished"/>
+ <translation>高级账户设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="381"/>
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
+ <translation>使用密ç åŠ å¯†æ‚¨çš„è´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
- <translation type="unfinished"/>
+ <translation>输入昵称ã€å§“æ°ã€â€¦â€¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="389"/>
@@ -1596,18 +1560,13 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="409"/>
<source>Banned</source>
- <translation type="unfinished"/>
+ <translation>å·²å±è”½</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="411"/>
<source>Banned contacts</source>
<translation>å·²å±è”½çš„è”系人</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>您确定è¦åˆ 除æ¤è´¦æˆ·å—？</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1681,7 +1640,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="435"/>
<source>Text zoom</source>
- <translation type="unfinished"/>
+ <translation>æ–‡å—缩放</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="438"/>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation>网络已æ–å¼€</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1813,17 +1797,17 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="732"/>
<source>%1 Members</source>
- <translation type="unfinished"/>
+ <translation>%1 个æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="733"/>
<source>Member</source>
- <translation type="unfinished"/>
+ <translation>æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="734"/>
<source>Documents</source>
- <translation type="unfinished"/>
+ <translation>文档</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="735"/>
@@ -1833,7 +1817,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="736"/>
<source>Add a description</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ æè¿°</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="738"/>
@@ -1843,12 +1827,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="739"/>
<source>Ignore all notifications from this conversation</source>
- <translation type="unfinished"/>
+ <translation>忽略æ¥è‡ªæ¤å¯¹è¯çš„所有æ醒</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="740"/>
<source>Choose a color</source>
- <translation type="unfinished"/>
+ <translation>选择一个颜色</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="741"/>
@@ -1858,7 +1842,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="742"/>
<source>Leave</source>
- <translation type="unfinished"/>
+ <translation>离开</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="743"/>
@@ -1883,7 +1867,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="749"/>
<source>Go to conversation</source>
- <translation type="unfinished"/>
+ <translation>å‰å¾€ä¼šè¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="750"/>
@@ -1893,63 +1877,48 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="751"/>
<source>Kick member</source>
- <translation type="unfinished"/>
+ <translation>踢出æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="752"/>
<source>Administrator</source>
- <translation type="unfinished"/>
+ <translation>管ç†å‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="753"/>
<source>Invited</source>
- <translation type="unfinished"/>
+ <translation>已邀请</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="754"/>
<source>Remove member</source>
- <translation type="unfinished"/>
+ <translation>移除æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="755"/>
<source>To:</source>
- <translation type="unfinished"/>
+ <translation>至：</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="758"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="759"/>
<source>Tips</source>
- <translation type="unfinished"/>
+ <translation>æ示</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="760"/>
<source>Dismiss</source>
<translation>解散</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>您的账户资料仅会与您的è”系人分享</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2014,7 +1983,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="566"/>
<source>Enter account's password</source>
- <translation type="unfinished"/>
+ <translation>输入账户密ç </translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="582"/>
@@ -2093,27 +2062,22 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="650"/>
<source>Configure a SIP account</source>
- <translation type="unfinished"/>
+ <translation>é…ç½® SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="654"/>
<source>Join Jami</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
+ <translation>åŠ å…¥ Jami</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
- <translation type="unfinished"/>
+ <translation>我已ç»æœ‰ä¸€ä¸ªè´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="661"/>
<source>Use existing Jami account</source>
- <translation type="unfinished"/>
+ <translation>使用现å˜çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="662"/>
@@ -2123,12 +2087,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="663"/>
<source>Share this Jami identifier to be contacted on this account!</source>
- <translation type="unfinished"/>
+ <translation>åˆ†äº«æ¤ Jami æ ‡è¯†ç¬¦ï¼Œæ¥ä¸Žè¿™ä¸ªè´¦æˆ·é€šè®¯ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="664"/>
<source>Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!</source>
- <translation type="unfinished"/>
+ <translation>è¿™é‡Œæ˜¯ä½ çš„ Jami æ ‡è¯†ç¬¦ã€‚ä¸è¦çŠ¹è±«ï¼Œåˆ†äº«å®ƒï¼Œè®©é€šè®¯æ›´æ–¹ä¾¿ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="680"/>
@@ -2223,25 +2187,45 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>å¤åˆ¶</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
- <translation type="unfinished"/>
+ <translation>Jami 归档文件 (*.gz)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="219"/>
<source>All files (*)</source>
- <translation type="unfinished"/>
+ <translation>所有文件 (*)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="236"/>
<source>Mute camera</source>
- <translation type="unfinished"/>
+ <translation>æ‘„åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="237"/>
<source>Unmute camera</source>
- <translation type="unfinished"/>
+ <translation>å–消摄åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="240"/>
@@ -2258,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>您在您的设备上ä»ç„¶è¢«é™éŸ³</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2266,6 +2255,16 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="268"/>
<source>Confirm action</source>
+ <translation>确认æ“作</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2276,7 +2275,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="275"/>
<source>Conversation details</source>
- <translation type="unfinished"/>
+ <translation>对è¯è¯¦æƒ…</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="284"/>
@@ -2291,32 +2290,27 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="314"/>
<source>Enter the Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>输入 Jami å¸å·ç®¡ç†æœåŠ¡å™¨ï¼ˆJAMS）的 URL</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="317"/>
<source>Enter JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>输入 JAMS å‡æ®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="325"/>
<source>Choose a username</source>
- <translation type="unfinished"/>
+ <translation>选择一个用户å</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="326"/>
<source>Choose an identifier</source>
- <translation type="unfinished"/>
+ <translation>é€‰æ‹©ä¸€ä¸ªæ ‡è¯†ç¬¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="327"/>
<source>The identifier is not available</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
+ <translation>è¯¥æ ‡è¯†ç¬¦ä¸å¯ç”¨</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
@@ -2328,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>éšè—高级设置</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>éšè—被å±è”½çš„è”系人</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2361,7 +2381,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="486"/>
<source>This feature is in development.</source>
- <translation type="unfinished"/>
+ <translation>æ¤åŠŸèƒ½æ£åœ¨å¼€å‘ä¸ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="490"/>
@@ -2391,7 +2411,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="497"/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"/>
+ <translation>键盘快æ·é”®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="499"/>
@@ -2523,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>从备份创建您的账户</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>您å¯åœ¨è´¦æˆ·è®¾ç½®ä¸ç‚¹å‡»â€œå¯¼å‡ºè´¦æˆ·â€èŽ·å¾—归档。这会在您的设备上创建一个以 .gz 结尾的文件。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2541,12 +2556,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="542"/>
<source>Import a Jami account from an archive file on this device.</source>
- <translation type="unfinished"/>
+ <translation>从设备上的账户档案文件导入 Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="543"/>
<source>Select archive file</source>
- <translation type="unfinished"/>
+ <translation>选择归档文件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="546"/>
@@ -2561,7 +2576,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="552"/>
<source>A PIN is required to use an existing Jami account on this device.</source>
- <translation type="unfinished"/>
+ <translation>éœ€è¦ PIN ç 以在æ¤è®¾å¤‡ä¸Šä½¿ç”¨çŽ°æœ‰çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="553"/>
@@ -2576,12 +2591,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="555"/>
<source>Step 3</source>
- <translation type="unfinished"/>
+ <translation>第3æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="556"/>
<source>Step 4</source>
- <translation type="unfinished"/>
+ <translation>第4æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="557"/>
@@ -2591,17 +2606,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="558"/>
<source>Choose the account to link</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
+ <translation>选择è¦è¿žæŽ¥çš„账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
@@ -2658,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>导出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>选择图片作为头åƒ</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2676,7 +2676,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="585"/>
<source>Image Files (*.png *.jpg *.jpeg)</source>
- <translation type="unfinished"/>
+ <translation>图åƒæ–‡ä»¶ (*.png *.jpg *.jpeg)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="589"/>
@@ -2696,7 +2696,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="592"/>
<source>Reset Preferences</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å好设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="593"/>
@@ -2716,22 +2716,22 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="596"/>
<source>Are you sure you wish to reset %1 preferences?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦é‡ç½®%1å好设置å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="597"/>
<source>Are you sure you wish to uninstall %1?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦å¸è½½ %1 å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="604"/>
<source>Display or hide General plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—通用æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="605"/>
<source>Display or hide Account plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—账户æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="606"/>
@@ -2741,7 +2741,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="607"/>
<source>Plugin Files (*.jpl)</source>
- <translation type="unfinished"/>
+ <translation>æ’件文件 (*.jpl)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="608"/>
@@ -2751,7 +2751,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="609"/>
<source>Select An Image to %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 选择图片</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="610"/>
@@ -2766,7 +2766,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="612"/>
<source>Choose Plugin</source>
- <translation type="unfinished"/>
+ <translation>选择æ’件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="616"/>
@@ -2816,7 +2816,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="632"/>
<source>Screen %1</source>
- <translation type="unfinished"/>
+ <translation>å±å¹• %1</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="635"/>
@@ -2848,7 +2848,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="644"/>
<source>Import from an archive backup</source>
- <translation type="unfinished"/>
+ <translation>从归档备份导入</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="645"/>
@@ -2981,17 +2981,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="69"/>
<source>Increase font size</source>
- <translation type="unfinished"/>
+ <translation>å¢žåŠ å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="73"/>
<source>Decrease font size</source>
- <translation type="unfinished"/>
+ <translation>å‡å°‘å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="77"/>
<source>Reset font size</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="86"/>
@@ -3657,126 +3657,126 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/tipsmodel.cpp" line="25"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="27"/>
<source>What does Jami mean?</source>
- <translation type="unfinished"/>
+ <translation>Jami 有何å«ä¹‰ï¼Ÿ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_zh_HK.ts b/translations/ring_client_windows_zh_HK.ts
index 090ec4169e6a897241125da4822738e121e00e77..4c0375d17c5ab8c1116fead23e01fc937f90520a 100644
--- a/translations/ring_client_windows_zh_HK.ts
+++ b/translations/ring_client_windows_zh_HK.ts
@@ -88,7 +88,7 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>æ£€æµ‹åˆ°æ— æ•ˆçš„æ¶ˆæ¯</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
@@ -218,15 +218,10 @@
<source>Incoming video call from {}</source>
<translation>{} 视频æ¥ç”µ</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
+ <translation>转移对è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="86"/>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>选择视频帧率 (fps)</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>本账户仅å˜åœ¨äºŽæ¤è®¾å¤‡ä¸Šã€‚如果您丢失了该设备或å¸è½½äº†æœ¬åº”ç”¨ï¼Œé‚£ä¹ˆæ‚¨çš„è´¦æˆ·ä¹Ÿä¼šè¢«åˆ é™¤å¹¶ä¸”æ— æ³•æ¢å¤ã€‚您å¯çŽ°åœ¨æˆ–ç¨åŽå¤‡ä»½æ‚¨çš„账户。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>创建集åˆç‚¹</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>创建密ç æ¥åŠ 密æ¤è®¾å¤‡ä¸Šçš„账户。请注æ„密ç æ— æ³•æ¢å¤ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>为您的集åˆç‚¹é€‰æ‹©ä¸€ä¸ªå称</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>å¦‚æžœæ‚¨çš„è´¦æˆ·å°šæœªå¤‡ä»½æˆ–æ·»åŠ åˆ°å…¶ä»–è®¾å¤‡ï¼Œæ‚¨çš„è´¦æˆ·å’Œå·²æ³¨å†Œå称将ä¸å¯æŒ½å›žåœ°ä¸¢å¤±ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>啟用</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -580,12 +599,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="43"/>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
+ <translation>Jami 是通用的通信平å°ï¼Œä»¥éšç§ä¸ºåŸºç¡€ï¼Œä¾èµ–于自由的分布å¼ç½‘络，为æ¯ä¸€ä¸ªäººæœåŠ¡</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation>Jami 是一个普é通信平å°ï¼Œå°Šé‡ç”¨æˆ·çš„自由与éšç§ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="64"/>
@@ -600,7 +624,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="68"/>
<source>Add to conversation</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ åˆ°å¯¹è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="69"/>
@@ -610,12 +634,12 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
<source>Certificate File (*.crt)</source>
- <translation type="unfinished"/>
+ <translation>è¯ä¹¦æ–‡ä»¶ (*.crt)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="93"/>
<source>Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</source>
- <translation type="unfinished"/>
+ <translation>音频文件 (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="96"/>
@@ -640,7 +664,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="124"/>
<source>Key File (*.key)</source>
- <translation type="unfinished"/>
+ <translation>密钥文件 (*.key)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="127"/>
@@ -919,19 +943,19 @@
<translation>沒有視訊</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>在æ¤å¤‡ä»½è´¦æˆ·</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>備份您的帳號ï¼</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>备份账户</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>在æ—è¾¹</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>在顶部</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>éšè—自己</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>移除会è¯</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>您真的è¦åˆ 除æ¤ä¼šè¯å—？</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>布局设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>这是æ¥è‡ªåŽç«¯çš„错误：%0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>确认密ç </translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>å¯é€‰</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>å·²å–得的使用者å稱</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1368,37 +1373,17 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="347"/>
<source>Local</source>
- <translation type="unfinished"/>
+ <translation>本地的</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="348"/>
<source>Encrypt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
+ <translation>åŠ å¯†</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
- <translation type="unfinished"/>
+ <translation>SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="357"/>
@@ -1423,7 +1408,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="361"/>
<source>Personalize account</source>
- <translation type="unfinished"/>
+ <translation>个性化账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="362"/>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>更改当å‰å¯†ç </translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>备份账户到 .gz 文件</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1493,38 +1473,22 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
<source>Advanced account settings</source>
- <translation type="unfinished"/>
+ <translation>高级账户设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="381"/>
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
+ <translation>使用密ç åŠ å¯†æ‚¨çš„è´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
- <translation type="unfinished"/>
+ <translation>输入昵称ã€å§“æ°ã€â€¦â€¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="389"/>
@@ -1596,18 +1560,13 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="409"/>
<source>Banned</source>
- <translation type="unfinished"/>
+ <translation>å·²å±è”½</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="411"/>
<source>Banned contacts</source>
<translation>å·²å±è”½çš„è”系人</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>您确定è¦åˆ 除æ¤è´¦æˆ·å—？</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1681,7 +1640,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="435"/>
<source>Text zoom</source>
- <translation type="unfinished"/>
+ <translation>æ–‡å—缩放</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="438"/>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation>网络已æ–å¼€</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1813,17 +1797,17 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="732"/>
<source>%1 Members</source>
- <translation type="unfinished"/>
+ <translation>%1 个æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="733"/>
<source>Member</source>
- <translation type="unfinished"/>
+ <translation>æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="734"/>
<source>Documents</source>
- <translation type="unfinished"/>
+ <translation>文档</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="735"/>
@@ -1833,7 +1817,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="736"/>
<source>Add a description</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ æè¿°</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="738"/>
@@ -1843,12 +1827,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="739"/>
<source>Ignore all notifications from this conversation</source>
- <translation type="unfinished"/>
+ <translation>忽略æ¥è‡ªæ¤å¯¹è¯çš„所有æ醒</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="740"/>
<source>Choose a color</source>
- <translation type="unfinished"/>
+ <translation>选择一个颜色</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="741"/>
@@ -1858,7 +1842,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="742"/>
<source>Leave</source>
- <translation type="unfinished"/>
+ <translation>离开</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="743"/>
@@ -1883,7 +1867,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="749"/>
<source>Go to conversation</source>
- <translation type="unfinished"/>
+ <translation>å‰å¾€ä¼šè¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="750"/>
@@ -1893,63 +1877,48 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="751"/>
<source>Kick member</source>
- <translation type="unfinished"/>
+ <translation>踢出æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="752"/>
<source>Administrator</source>
- <translation type="unfinished"/>
+ <translation>管ç†å‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="753"/>
<source>Invited</source>
- <translation type="unfinished"/>
+ <translation>已邀请</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="754"/>
<source>Remove member</source>
- <translation type="unfinished"/>
+ <translation>移除æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="755"/>
<source>To:</source>
- <translation type="unfinished"/>
+ <translation>至：</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="758"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="759"/>
<source>Tips</source>
- <translation type="unfinished"/>
+ <translation>æ示</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="760"/>
<source>Dismiss</source>
<translation>解散</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>您的账户资料仅会与您的è”系人分享</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2014,7 +1983,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="566"/>
<source>Enter account's password</source>
- <translation type="unfinished"/>
+ <translation>输入账户密ç </translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="582"/>
@@ -2093,27 +2062,22 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="650"/>
<source>Configure a SIP account</source>
- <translation type="unfinished"/>
+ <translation>é…ç½® SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="654"/>
<source>Join Jami</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
+ <translation>åŠ å…¥ Jami</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
- <translation type="unfinished"/>
+ <translation>我已ç»æœ‰ä¸€ä¸ªè´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="661"/>
<source>Use existing Jami account</source>
- <translation type="unfinished"/>
+ <translation>使用现å˜çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="662"/>
@@ -2123,12 +2087,12 @@ Jami 将立å³é€€å‡ºã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="663"/>
<source>Share this Jami identifier to be contacted on this account!</source>
- <translation type="unfinished"/>
+ <translation>åˆ†äº«æ¤ Jami æ ‡è¯†ç¬¦ï¼Œæ¥ä¸Žè¿™ä¸ªè´¦æˆ·é€šè®¯ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="664"/>
<source>Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!</source>
- <translation type="unfinished"/>
+ <translation>è¿™é‡Œæ˜¯ä½ çš„ Jami æ ‡è¯†ç¬¦ã€‚ä¸è¦çŠ¹è±«ï¼Œåˆ†äº«å®ƒï¼Œè®©é€šè®¯æ›´æ–¹ä¾¿ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="680"/>
@@ -2223,25 +2187,45 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>複製</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
- <translation type="unfinished"/>
+ <translation>Jami 归档文件 (*.gz)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="219"/>
<source>All files (*)</source>
- <translation type="unfinished"/>
+ <translation>所有文件 (*)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="236"/>
<source>Mute camera</source>
- <translation type="unfinished"/>
+ <translation>æ‘„åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="237"/>
<source>Unmute camera</source>
- <translation type="unfinished"/>
+ <translation>å–消摄åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="240"/>
@@ -2258,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>您在您的设备上ä»ç„¶è¢«é™éŸ³</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2266,6 +2255,16 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="268"/>
<source>Confirm action</source>
+ <translation>确认æ“作</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2276,7 +2275,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="275"/>
<source>Conversation details</source>
- <translation type="unfinished"/>
+ <translation>对è¯è¯¦æƒ…</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="284"/>
@@ -2291,32 +2290,27 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="314"/>
<source>Enter the Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>输入 Jami å¸å·ç®¡ç†æœåŠ¡å™¨ï¼ˆJAMS）的 URL</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="317"/>
<source>Enter JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>输入 JAMS å‡æ®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="325"/>
<source>Choose a username</source>
- <translation type="unfinished"/>
+ <translation>选择一个用户å</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="326"/>
<source>Choose an identifier</source>
- <translation type="unfinished"/>
+ <translation>é€‰æ‹©ä¸€ä¸ªæ ‡è¯†ç¬¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="327"/>
<source>The identifier is not available</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
+ <translation>è¯¥æ ‡è¯†ç¬¦ä¸å¯ç”¨</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
@@ -2328,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>éšè—高级设置</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>éšè—被å±è”½çš„è”系人</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2361,7 +2381,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="486"/>
<source>This feature is in development.</source>
- <translation type="unfinished"/>
+ <translation>æ¤åŠŸèƒ½æ£åœ¨å¼€å‘ä¸ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="490"/>
@@ -2391,7 +2411,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="497"/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"/>
+ <translation>键盘快æ·é”®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="499"/>
@@ -2523,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>从备份创建您的账户</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>您å¯åœ¨è´¦æˆ·è®¾ç½®ä¸ç‚¹å‡»â€œå¯¼å‡ºè´¦æˆ·â€èŽ·å¾—归档。这会在您的设备上创建一个以 .gz 结尾的文件。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2541,12 +2556,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="542"/>
<source>Import a Jami account from an archive file on this device.</source>
- <translation type="unfinished"/>
+ <translation>从设备上的账户档案文件导入 Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="543"/>
<source>Select archive file</source>
- <translation type="unfinished"/>
+ <translation>选择归档文件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="546"/>
@@ -2561,7 +2576,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="552"/>
<source>A PIN is required to use an existing Jami account on this device.</source>
- <translation type="unfinished"/>
+ <translation>éœ€è¦ PIN ç 以在æ¤è®¾å¤‡ä¸Šä½¿ç”¨çŽ°æœ‰çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="553"/>
@@ -2576,12 +2591,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="555"/>
<source>Step 3</source>
- <translation type="unfinished"/>
+ <translation>第3æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="556"/>
<source>Step 4</source>
- <translation type="unfinished"/>
+ <translation>第4æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="557"/>
@@ -2591,17 +2606,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="558"/>
<source>Choose the account to link</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
+ <translation>选择è¦è¿žæŽ¥çš„账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
@@ -2658,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>导出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>选择图片作为头åƒ</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2676,7 +2676,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="585"/>
<source>Image Files (*.png *.jpg *.jpeg)</source>
- <translation type="unfinished"/>
+ <translation>图åƒæ–‡ä»¶ (*.png *.jpg *.jpeg)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="589"/>
@@ -2696,7 +2696,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="592"/>
<source>Reset Preferences</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å好设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="593"/>
@@ -2716,22 +2716,22 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="596"/>
<source>Are you sure you wish to reset %1 preferences?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦é‡ç½®%1å好设置å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="597"/>
<source>Are you sure you wish to uninstall %1?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦å¸è½½ %1 å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="604"/>
<source>Display or hide General plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—通用æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="605"/>
<source>Display or hide Account plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—账户æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="606"/>
@@ -2741,7 +2741,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="607"/>
<source>Plugin Files (*.jpl)</source>
- <translation type="unfinished"/>
+ <translation>æ’件文件 (*.jpl)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="608"/>
@@ -2751,7 +2751,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="609"/>
<source>Select An Image to %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 选择图片</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="610"/>
@@ -2766,7 +2766,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="612"/>
<source>Choose Plugin</source>
- <translation type="unfinished"/>
+ <translation>选择æ’件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="616"/>
@@ -2816,7 +2816,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="632"/>
<source>Screen %1</source>
- <translation type="unfinished"/>
+ <translation>å±å¹• %1</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="635"/>
@@ -2848,7 +2848,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="644"/>
<source>Import from an archive backup</source>
- <translation type="unfinished"/>
+ <translation>从归档备份导入</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="645"/>
@@ -2981,17 +2981,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="69"/>
<source>Increase font size</source>
- <translation type="unfinished"/>
+ <translation>å¢žåŠ å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="73"/>
<source>Decrease font size</source>
- <translation type="unfinished"/>
+ <translation>å‡å°‘å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="77"/>
<source>Reset font size</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="86"/>
@@ -3657,126 +3657,126 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/tipsmodel.cpp" line="25"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="27"/>
<source>What does Jami mean?</source>
- <translation type="unfinished"/>
+ <translation>Jami 有何å«ä¹‰ï¼Ÿ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>
diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts
index a6b987519eb2facc62bd12c7f280486d5902fda4..ba6b31c6b15f6d6717b84389247db643c41784b3 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -88,7 +88,7 @@
<message>
<location filename="../src/app/currentconversation.cpp" line="176"/>
<source>An invalid message was detected</source>
- <translation type="unfinished"/>
+ <translation>æ£€æµ‹åˆ°æ— æ•ˆçš„æ¶ˆæ¯</translation>
</message>
<message>
<location filename="../src/app/currentconversation.cpp" line="178"/>
@@ -218,15 +218,10 @@
<source>Incoming video call from {}</source>
<translation>來自 {} 的視訊來電</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
- <source>Migrating to the Swarm technology will enable syncing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="45"/>
<source>Migrate conversation</source>
- <translation type="unfinished"/>
+ <translation>转移对è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="86"/>
@@ -388,11 +383,6 @@
<source>Select video frame rate (frames per second)</source>
<translation>é¸å–視訊畫é¢çŽ‡ï¼ˆæ¯ç§’ç•«é¢æ•¸ï¼‰</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
- <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and can not be recovered. You can backup your account now or later.</source>
- <translation>您的帳號僅å˜æ–¼æ¤è£ç½®ä¸Šã€‚如果您éºå¤±äº†æ‚¨çš„è£ç½®æˆ–解除安è£æ‡‰ç”¨ç¨‹å¼ï¼Œæ‚¨çš„帳號將會被刪除且無法復原。您å¯ä»¥ç«‹åˆ»å‚™ä»½æ‚¨çš„帳號或ç¨å¾Œå†åšã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="35"/>
<location filename="../src/app/constant/JamiStrings.qml" line="233"/>
@@ -425,21 +415,11 @@
<source>Create a rendezvous point</source>
<translation>建立 rendezvous 點</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
- <source>Choose a password to encrypt your account on this device. Note that the password cannot be recovered.</source>
- <translation>é¸æ“‡å¯†ç¢¼ä»¥åœ¨æ¤è£ç½®ä¸ŠåŠ 密您的帳號。請注æ„，æ¤å¯†ç¢¼ç„¡æ³•è¢«å¾©åŽŸã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="334"/>
<source>Choose a name for your rendezvous point</source>
<translation>é¸æ“‡æ‚¨ rendezvous 點的å稱</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
- <source>If your account has not been backed up or added to another device, your account and registered name will be irrevocably lost.</source>
- <translation>如果您的帳號未備份，或是新增至其他è£ç½®ï¼Œæ‚¨çš„帳號與已註冊的å稱將會ä¸å¯é€†åœ°éºå¤±ã€‚</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="431"/>
<source>Launch at startup</source>
@@ -481,6 +461,45 @@
<source>Enable</source>
<translation>啟用</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
+ <source>Are you sure you would like to join Jami without a username?
+If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
+ <source>- 32 characters maximum
+- Alphabetical characters (A to Z and a to z)
+- Numeric characters (0 to 9)
+- Special characters allowed: dash (-)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
+ <source>Your account will be created and stored locally.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
+ <source>Choosing a username is recommended, and a chosen username CANNOT be changed later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
+ <source>Encrypting your account with a password is optional, and if the password is lost it CANNOT be recovered later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
+ <source>Setting a profile picture and nickname is optional, and can also be changed later in the settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
+ <source>Back up account to a .gz file</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="598"/>
<source>Display or hide preferences</source>
@@ -580,12 +599,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="43"/>
<source>Jami is a universal communication platform, with privacy as its foundation, that relies on a free distributed network for everyone.</source>
+ <translation>Jami 是通用的通信平å°ï¼Œä»¥éšç§ä¸ºåŸºç¡€ï¼Œä¾èµ–于自由的分布å¼ç½‘络，为æ¯ä¸€ä¸ªäººæœåŠ¡</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="44"/>
+ <source>Migrating to the Swarm technology will enable synchronizing this conversation across multiple devices and improve reliability. The legacy conversation history will be cleared in the process.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="57"/>
<source>Jami is a free universal communication software that respects the freedom and privacy of its users.</source>
- <translation type="unfinished"/>
+ <translation>Jami 是一个普é通信平å°ï¼Œå°Šé‡ç”¨æˆ·çš„自由与éšç§ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="64"/>
@@ -600,7 +624,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="68"/>
<source>Add to conversation</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ åˆ°å¯¹è¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="69"/>
@@ -610,12 +634,12 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="92"/>
<source>Certificate File (*.crt)</source>
- <translation type="unfinished"/>
+ <translation>è¯ä¹¦æ–‡ä»¶ (*.crt)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="93"/>
<source>Audio File (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</source>
- <translation type="unfinished"/>
+ <translation>音频文件 (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="96"/>
@@ -640,7 +664,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="124"/>
<source>Key File (*.key)</source>
- <translation type="unfinished"/>
+ <translation>密钥文件 (*.key)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="127"/>
@@ -919,19 +943,19 @@
<translation>沒有視訊</translation>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
- <source>Backup account here</source>
- <translation>在æ¤å‚™ä»½å¸³è™Ÿ</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
+ <source>Add a profile picture and nickname to complete your profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
- <source>Backup your account!</source>
- <translation>備份您的帳號ï¼</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
+ <source>This profile is only shared with this account's contacts</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
- <source>Backup account</source>
- <translation>備份帳號</translation>
+ <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
+ <source>Why should I save my account?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="213"/>
@@ -1068,22 +1092,17 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="253"/>
<source>On the side</source>
- <translation type="unfinished"/>
+ <translation>在æ—è¾¹</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="254"/>
<source>On the top</source>
- <translation type="unfinished"/>
+ <translation>在顶部</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="255"/>
<source>Hide self</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
- <source>Hide participant without video</source>
- <translation type="unfinished"/>
+ <translation>éšè—自己</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="261"/>
@@ -1115,16 +1134,6 @@
<source>Remove conversation</source>
<translation>移除å°è©±</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
- <source>Do you really want to remove this conversation?</source>
- <translation>您真的想è¦ç§»é™¤æ¤å°è©±å—Žï¼Ÿ</translation>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
- <source>Do you really want to block this conversation?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="272"/>
<source>Remove contact</source>
@@ -1218,7 +1227,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="296"/>
<source>Layout settings</source>
- <translation type="unfinished"/>
+ <translation>布局设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="299"/>
@@ -1248,7 +1257,7 @@
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="304"/>
<source>This is the error from the backend: %0</source>
- <translation type="unfinished"/>
+ <translation>这是æ¥è‡ªåŽç«¯çš„错误：%0</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="307"/>
@@ -1316,11 +1325,21 @@
<source>Confirm password</source>
<translation>確èªå¯†ç¢¼</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="331"/>
+ <source>Choose a password to encrypt your account on this device. Note that the password CANNOT be recovered.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="332"/>
<source>Optional</source>
<translation>é¸æ“‡æ€§</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
+ <source>You can choose a username to help others more easily find and reach you on Jami.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="335"/>
<source>Choose a name</source>
@@ -1346,20 +1365,6 @@
<source>Username already taken</source>
<translation>å·²å–得的使用者å稱</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="341"/>
- <source>Are you sure that you want to join Jami without a username?
-If yes, only a randomly generated 40-character identifier will be assigned to this account.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="342"/>
- <source>- 32 characters maximum
-- Alphabetical characters (A to Z)
-- Numeric characters (0 to 9)
-- Special character autorized: dash (-)</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="346"/>
<source>Good to know</source>
@@ -1368,37 +1373,17 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="347"/>
<source>Local</source>
- <translation type="unfinished"/>
+ <translation>本地的</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="348"/>
<source>Encrypt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="349"/>
- <source>This account is created locally</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="350"/>
- <source>Choose a username is recommended and it can’t be changed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="351"/>
- <source>Encrypt your account with a password is optional and it can’t be recovered</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="352"/>
- <source>The picture and the nickname are optional and can be changed in the settings</source>
- <translation type="unfinished"/>
+ <translation>åŠ å¯†</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="356"/>
<source>SIP account</source>
- <translation type="unfinished"/>
+ <translation>SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="357"/>
@@ -1423,7 +1408,7 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="361"/>
<source>Personalize account</source>
- <translation type="unfinished"/>
+ <translation>个性化账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="362"/>
@@ -1480,11 +1465,6 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<source>Change current password</source>
<translation>變更目å‰å¯†ç¢¼</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="375"/>
- <source>Backup account to a .gz file</source>
- <translation>備份帳號為 .gz 檔案</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="378"/>
<source>Enable account</source>
@@ -1493,38 +1473,22 @@ If yes, only a randomly generated 40-character identifier will be assigned to th
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="379"/>
<source>Advanced account settings</source>
- <translation type="unfinished"/>
+ <translation>高级账户设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="381"/>
<source>Customize profile</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
- <source>This profile is only shared with this account's contacts.
-The profile can be changed at all time in the account's settings.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="383"/>
<source>Encrypt your account with a password</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
- <source>A Jami account is registered only on this device as an archive containing the keys of your account. Access to this archive can be protected by a password.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
- <source>Please note that if you loose your password it cannot be recovered!</source>
- <translation type="unfinished"/>
+ <translation>使用密ç åŠ å¯†æ‚¨çš„è´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="386"/>
<source>Enter a nickname, surname...</source>
- <translation type="unfinished"/>
+ <translation>输入昵称ã€å§“æ°ã€â€¦â€¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="389"/>
@@ -1596,18 +1560,13 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="409"/>
<source>Banned</source>
- <translation type="unfinished"/>
+ <translation>å·²å±è”½</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="411"/>
<source>Banned contacts</source>
<translation>已被阻擋的連絡人</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
- <source>Do you really want to delete this account?</source>
- <translation>您真的想è¦åˆªé™¤æ¤å¸³è™Ÿå—Žï¼Ÿ</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="418"/>
<source>Save new device name</source>
@@ -1681,7 +1640,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="435"/>
<source>Text zoom</source>
- <translation type="unfinished"/>
+ <translation>æ–‡å—缩放</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="438"/>
@@ -1805,6 +1764,31 @@ Please try again later.</source>
<source>Network disconnected</source>
<translation>網路已斷線</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
+ <source>You can obtain an archive by clicking on "Back up account" in the account settings. This will create a .gz file on your device.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
+ <source>Select "Link another device"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
+ <source>The PIN code will be valid for 10 minutes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
+ <source>Choose a picture as your avatar</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
+ <source>Share freely and privately with Jami</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="731"/>
<source>About</source>
@@ -1813,17 +1797,17 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="732"/>
<source>%1 Members</source>
- <translation type="unfinished"/>
+ <translation>%1 个æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="733"/>
<source>Member</source>
- <translation type="unfinished"/>
+ <translation>æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="734"/>
<source>Documents</source>
- <translation type="unfinished"/>
+ <translation>文档</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="735"/>
@@ -1833,7 +1817,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="736"/>
<source>Add a description</source>
- <translation type="unfinished"/>
+ <translation>æ·»åŠ æè¿°</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="738"/>
@@ -1843,12 +1827,12 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="739"/>
<source>Ignore all notifications from this conversation</source>
- <translation type="unfinished"/>
+ <translation>忽略æ¥è‡ªæ¤å¯¹è¯çš„所有æ醒</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="740"/>
<source>Choose a color</source>
- <translation type="unfinished"/>
+ <translation>选择一个颜色</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="741"/>
@@ -1858,7 +1842,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="742"/>
<source>Leave</source>
- <translation type="unfinished"/>
+ <translation>离开</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="743"/>
@@ -1883,7 +1867,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="749"/>
<source>Go to conversation</source>
- <translation type="unfinished"/>
+ <translation>å‰å¾€ä¼šè¯</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="750"/>
@@ -1893,63 +1877,48 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="751"/>
<source>Kick member</source>
- <translation type="unfinished"/>
+ <translation>踢出æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="752"/>
<source>Administrator</source>
- <translation type="unfinished"/>
+ <translation>管ç†å‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="753"/>
<source>Invited</source>
- <translation type="unfinished"/>
+ <translation>已邀请</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="754"/>
<source>Remove member</source>
- <translation type="unfinished"/>
+ <translation>移除æˆå‘˜</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="755"/>
<source>To:</source>
- <translation type="unfinished"/>
+ <translation>至：</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="758"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="759"/>
<source>Tips</source>
- <translation type="unfinished"/>
+ <translation>æ示</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="760"/>
<source>Dismiss</source>
<translation>忽略</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="761"/>
- <source>Add a picture and a nickname to complete your profile</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="762"/>
- <source>This profile is only shared with this account’s contacts</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="763"/>
<source>Your profile is only shared with your contacts</source>
<translation>您的介紹僅與您的è¯çµ¡äººåˆ†äº«</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="764"/>
- <source>Why should I save my account ?</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="457"/>
<location filename="../src/app/constant/JamiStrings.qml" line="479"/>
@@ -2014,7 +1983,7 @@ Please try again later.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="566"/>
<source>Enter account's password</source>
- <translation type="unfinished"/>
+ <translation>输入账户密ç </translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="582"/>
@@ -2093,27 +2062,22 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="650"/>
<source>Configure a SIP account</source>
- <translation type="unfinished"/>
+ <translation>é…ç½® SIP 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="654"/>
<source>Join Jami</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="659"/>
- <source>Share, freely and privately with Jami</source>
- <translation type="unfinished"/>
+ <translation>åŠ å…¥ Jami</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="660"/>
<source>I already have an account</source>
- <translation type="unfinished"/>
+ <translation>我已ç»æœ‰ä¸€ä¸ªè´¦æˆ·</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="661"/>
<source>Use existing Jami account</source>
- <translation type="unfinished"/>
+ <translation>使用现å˜çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="662"/>
@@ -2123,12 +2087,12 @@ Jami 將會çµæŸã€‚</translation>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="663"/>
<source>Share this Jami identifier to be contacted on this account!</source>
- <translation type="unfinished"/>
+ <translation>åˆ†äº«æ¤ Jami æ ‡è¯†ç¬¦ï¼Œæ¥ä¸Žè¿™ä¸ªè´¦æˆ·é€šè®¯ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="664"/>
<source>Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!</source>
- <translation type="unfinished"/>
+ <translation>è¿™é‡Œæ˜¯ä½ çš„ Jami æ ‡è¯†ç¬¦ã€‚ä¸è¦çŠ¹è±«ï¼Œåˆ†äº«å®ƒï¼Œè®©é€šè®¯æ›´æ–¹ä¾¿ï¼</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="680"/>
@@ -2223,25 +2187,45 @@ connects to synchronize the conversation.</source>
<source>Copy</source>
<translation>複製</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="206"/>
+ <source>Your account only exists on this device. If you lose your device or uninstall the application, your account will be deleted and CANNOT be recovered. You can back up your account now or later.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="210"/>
+ <source>Back up account here</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="211"/>
+ <source>Back up your account!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="212"/>
+ <source>Back up account</source>
+ <translation>備份帳號</translation>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="218"/>
<source>Jami archive files (*.gz)</source>
- <translation type="unfinished"/>
+ <translation>Jami 归档文件 (*.gz)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="219"/>
<source>All files (*)</source>
- <translation type="unfinished"/>
+ <translation>所有文件 (*)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="236"/>
<source>Mute camera</source>
- <translation type="unfinished"/>
+ <translation>æ‘„åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="237"/>
<source>Unmute camera</source>
- <translation type="unfinished"/>
+ <translation>å–消摄åƒå¤´é™éŸ³</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="240"/>
@@ -2258,6 +2242,11 @@ connects to synchronize the conversation.</source>
<source>You are still muted on your device</source>
<translation>您在您的è£ç½®ä¸Šä»è™•æ–¼éœéŸ³ç‹€æ…‹</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="256"/>
+ <source>Hide audio-only participants</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="260"/>
<source>Share</source>
@@ -2266,6 +2255,16 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="268"/>
<source>Confirm action</source>
+ <translation>确认æ“作</translation>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="270"/>
+ <source>Would you really like to remove this conversation?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="271"/>
+ <source>Would you really like to block this conversation?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2276,7 +2275,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="275"/>
<source>Conversation details</source>
- <translation type="unfinished"/>
+ <translation>对è¯è¯¦æƒ…</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="284"/>
@@ -2291,32 +2290,27 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="314"/>
<source>Enter the Jami Account Management Server (JAMS) URL</source>
- <translation type="unfinished"/>
+ <translation>输入 Jami å¸å·ç®¡ç†æœåŠ¡å™¨ï¼ˆJAMS）的 URL</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="317"/>
<source>Enter JAMS credentials</source>
- <translation type="unfinished"/>
+ <translation>输入 JAMS å‡æ®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="325"/>
<source>Choose a username</source>
- <translation type="unfinished"/>
+ <translation>选择一个用户å</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="326"/>
<source>Choose an identifier</source>
- <translation type="unfinished"/>
+ <translation>é€‰æ‹©ä¸€ä¸ªæ ‡è¯†ç¬¦</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="327"/>
<source>The identifier is not available</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="333"/>
- <source>You can choose a username to be easily found and reached on Jami.</source>
- <translation type="unfinished"/>
+ <translation>è¯¥æ ‡è¯†ç¬¦ä¸å¯ç”¨</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="376"/>
@@ -2328,6 +2322,22 @@ connects to synchronize the conversation.</source>
<source>Hide advanced settings</source>
<translation>éš±è—進階è¨å®š</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="382"/>
+ <source>This profile is only shared with this account's contacts.
+The profile can be changed at all times from the account's settings.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="384"/>
+ <source>A Jami account is created and stored locally only on this device, as an archive containing your account keys. Access to this archive can optionally be protected by a password.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="385"/>
+ <source>Please note that if you lose your password, it CANNOT be recovered!</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="408"/>
<source>Display banned contacts</source>
@@ -2338,6 +2348,16 @@ connects to synchronize the conversation.</source>
<source>Hide banned contacts</source>
<translation>éš±è—黑åå–®è¯çµ¡äºº</translation>
</message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="414"/>
+ <source>Would you really like to delete this account?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/app/constant/JamiStrings.qml" line="415"/>
+ <source>If your account has not been backed up or added to another device, your account and registered username will be IRREVOCABLY LOST.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="441"/>
<source>Layout</source>
@@ -2361,7 +2381,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="486"/>
<source>This feature is in development.</source>
- <translation type="unfinished"/>
+ <translation>æ¤åŠŸèƒ½æ£åœ¨å¼€å‘ä¸ã€‚</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="490"/>
@@ -2391,7 +2411,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="497"/>
<source>Keyboard Shortcuts</source>
- <translation type="unfinished"/>
+ <translation>键盘快æ·é”®</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="499"/>
@@ -2523,11 +2543,6 @@ connects to synchronize the conversation.</source>
<source>Create your account from a backup</source>
<translation>從備份建立您的帳號</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="535"/>
- <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>您å¯ä»¥é€éŽé»žé¸å¸³è™Ÿè¨å®šä¸çš„「備份帳號ã€ä¾†å–å¾—å°å˜ã€‚這會在您的è£ç½®ä¸Šå»ºç«‹ä¸€å€‹ .gz 檔案。</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="538"/>
<source>Restore an account from backup</source>
@@ -2541,12 +2556,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="542"/>
<source>Import a Jami account from an archive file on this device.</source>
- <translation type="unfinished"/>
+ <translation>从设备上的账户档案文件导入 Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="543"/>
<source>Select archive file</source>
- <translation type="unfinished"/>
+ <translation>选择归档文件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="546"/>
@@ -2561,7 +2576,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="552"/>
<source>A PIN is required to use an existing Jami account on this device.</source>
- <translation type="unfinished"/>
+ <translation>éœ€è¦ PIN ç 以在æ¤è®¾å¤‡ä¸Šä½¿ç”¨çŽ°æœ‰çš„ Jami 账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="553"/>
@@ -2576,12 +2591,12 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="555"/>
<source>Step 3</source>
- <translation type="unfinished"/>
+ <translation>第3æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="556"/>
<source>Step 4</source>
- <translation type="unfinished"/>
+ <translation>第4æ¥</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="557"/>
@@ -2591,17 +2606,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="558"/>
<source>Choose the account to link</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="559"/>
- <source>Select “Link another deviceâ€</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="560"/>
- <source>The PIN code will be available for 10 minutes.</source>
- <translation type="unfinished"/>
+ <translation>选择è¦è¿žæŽ¥çš„账户</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="564"/>
@@ -2658,11 +2663,6 @@ connects to synchronize the conversation.</source>
<source>Export</source>
<translation>匯出</translation>
</message>
- <message>
- <location filename="../src/app/constant/JamiStrings.qml" line="580"/>
- <source>Choose a picture as avatar</source>
- <translation>é¸æ“‡è¦æˆç‚ºå¤§é 貼的圖片</translation>
- </message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="581"/>
<source>Import avatar from image file</source>
@@ -2676,7 +2676,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="585"/>
<source>Image Files (*.png *.jpg *.jpeg)</source>
- <translation type="unfinished"/>
+ <translation>图åƒæ–‡ä»¶ (*.png *.jpg *.jpeg)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="589"/>
@@ -2696,7 +2696,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="592"/>
<source>Reset Preferences</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å好设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="593"/>
@@ -2716,22 +2716,22 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="596"/>
<source>Are you sure you wish to reset %1 preferences?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦é‡ç½®%1å好设置å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="597"/>
<source>Are you sure you wish to uninstall %1?</source>
- <translation type="unfinished"/>
+ <translation>您确定想è¦å¸è½½ %1 å—？</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="604"/>
<source>Display or hide General plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—通用æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="605"/>
<source>Display or hide Account plugin settings</source>
- <translation type="unfinished"/>
+ <translation>显示或éšè—账户æ’件设置</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="606"/>
@@ -2741,7 +2741,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="607"/>
<source>Plugin Files (*.jpl)</source>
- <translation type="unfinished"/>
+ <translation>æ’件文件 (*.jpl)</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="608"/>
@@ -2751,7 +2751,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="609"/>
<source>Select An Image to %1</source>
- <translation type="unfinished"/>
+ <translation>为 %1 选择图片</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="610"/>
@@ -2766,7 +2766,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="612"/>
<source>Choose Plugin</source>
- <translation type="unfinished"/>
+ <translation>选择æ’件</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="616"/>
@@ -2816,7 +2816,7 @@ connects to synchronize the conversation.</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="632"/>
<source>Screen %1</source>
- <translation type="unfinished"/>
+ <translation>å±å¹• %1</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="635"/>
@@ -2848,7 +2848,7 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="644"/>
<source>Import from an archive backup</source>
- <translation type="unfinished"/>
+ <translation>从归档备份导入</translation>
</message>
<message>
<location filename="../src/app/constant/JamiStrings.qml" line="645"/>
@@ -2981,17 +2981,17 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="69"/>
<source>Increase font size</source>
- <translation type="unfinished"/>
+ <translation>å¢žåŠ å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="73"/>
<source>Decrease font size</source>
- <translation type="unfinished"/>
+ <translation>å‡å°‘å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="77"/>
<source>Reset font size</source>
- <translation type="unfinished"/>
+ <translation>é‡ç½®å—体大å°</translation>
</message>
<message>
<location filename="../src/app/mainview/components/KeyboardShortcutTable.qml" line="86"/>
@@ -3657,126 +3657,126 @@ Copy and share it with your friends!</source>
<message>
<location filename="../src/app/tipsmodel.cpp" line="25"/>
<source>Customize</source>
- <translation type="unfinished"/>
+ <translation>自定义</translation>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="27"/>
<source>What does Jami mean?</source>
- <translation type="unfinished"/>
+ <translation>Jami 有何å«ä¹‰ï¼Ÿ</translation>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="29"/>
- <source>The choice of the name Jami was inspired by the Swahili word jamii which means community as a noun and together as an adverb.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="33"/>
+ <source>What is the green dot next to my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="33"/>
- <source>What is the green dot next to my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="29"/>
+ <source>The choice of the name Jami was inspired by the Swahili word 'jamii', which means 'community' as a noun and 'together' as an adverb.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="35"/>
- <source>A red dot means that your account is disconnected from the network, it turns green when its connected</source>
+ <source>A red dot means that your account is disconnected from the network; it turns green when it's connected.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="39"/>
- <source>Why should I backup my account?</source>
+ <source>Why should I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/app/tipsmodel.cpp" line="41"/>
- <source>Jami is distributed and you're account is only stored on your device. If you loose your password, or your datas you can't recover it</source>
+ <source>Jami is distributed and your account is only stored locally on your device. If you lose your password or your local account data, you WILL NOT be able to recover your account if you did not back it up earlier.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="46"/>
+ <location filename="../src/app/tipsmodel.cpp" line="47"/>
<source>Can I make a conference call?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="47"/>
+ <location filename="../src/app/tipsmodel.cpp" line="48"/>
<source>In a call, you can click on "Add participants" to add a contact to a call</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="50"/>
+ <location filename="../src/app/tipsmodel.cpp" line="51"/>
<source>Does Jami have group chats?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="51"/>
+ <location filename="../src/app/tipsmodel.cpp" line="52"/>
<source>In the settings, you can enabled support for groups (experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="54"/>
+ <location filename="../src/app/tipsmodel.cpp" line="55"/>
<source>What is a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="56"/>
+ <location filename="../src/app/tipsmodel.cpp" line="57"/>
<source>A Jami account is an asymmetric encryption key. Your account is identified by a Jami ID, which is a fingerprint of your public key.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="60"/>
+ <location filename="../src/app/tipsmodel.cpp" line="61"/>
<source>What information do I need to provide to create a Jami account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="62"/>
- <source>When you create a new Jami account, you don’t have to provide any private information like an email, address, or phone number.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="63"/>
+ <source>When you create a new Jami account, you do not have to provide any private information like an email, address, or phone number.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="66"/>
- <source>Why don't I have to use a password?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="69"/>
+ <source>With Jami, your account is stored in a directory on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="68"/>
- <source>With Jami, your account is stored in a folder on your device. The password is only used to encrypt your account in order to protect you from someone who has physical access to your device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="83"/>
+ <source>In the account settings, a button is available to create a backup your account.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="74"/>
- <source>Why don't I have to register a username?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="88"/>
+ <source>Your account is only stored on your own devices. If you delete your account from all of your devices, the account is gone forever and you CANNOT recover it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="76"/>
- <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="92"/>
+ <source>Can I use my account on multiple devices?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="81"/>
- <source>How can I back up my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="94"/>
+ <source>Yes, you can link your account from the settings, or you can import your backup on another device.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="82"/>
- <source>In the account settings, a button is available to backup your account.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="67"/>
+ <source>Why don't I have to use a password?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="85"/>
- <source>What happens when I delete my account?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="75"/>
+ <source>Why don't I have to register a username?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="87"/>
- <source>Your account is only stored on your own devices. If you delete your account from each device, the account is gone and you cannot get it back.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="77"/>
+ <source>The most permanent, secure identifier is your Jami ID, but since these are difficult to use for some people, you also have the option of registering a username.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="91"/>
- <source>Can I use my account on multiple device?</source>
+ <location filename="../src/app/tipsmodel.cpp" line="82"/>
+ <source>How can I back up my account?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/app/tipsmodel.cpp" line="93"/>
- <source>Yes, you can link your account from the settings, or you can import your back-up on another device.</source>
+ <location filename="../src/app/tipsmodel.cpp" line="86"/>
+ <source>What happens when I delete my account?</source>
<translation type="unfinished"/>
</message>
</context>